add order at categories

internal/mappers/category_mapper.go

@@ -16,7 +16,7 @@ func CategoryEntityToModel(entity *entities.Category) *models.Category {
 		Name:           entity.Name,
 		Description:    entity.Description,
 		ImageURL:       nil,  // Entity doesn't have ImageURL, model does
-		SortOrder:      0,    // Entity doesn't have SortOrder, model does
+		Order:      	entity.Order,    // Entity doesn't have SortOrder, model does
 		IsActive:       true, // Entity doesn't have IsActive, default to true
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
@@ -32,7 +32,7 @@ func CategoryModelToEntity(model *models.Category) *entities.Category {
 	if model.ImageURL != nil {
 		metadata["image_url"] = *model.ImageURL
 	}
-	metadata["sort_order"] = model.SortOrder
+	// metadata["sort_order"] = model.SortOrder
 
 	return &entities.Category{
 		ID:             model.ID,
@@ -40,6 +40,7 @@ func CategoryModelToEntity(model *models.Category) *entities.Category {
 		Name:           model.Name,
 		Description:    model.Description,
 		BusinessType:   "restaurant", // Default business type
+		Order:          model.Order,
 		Metadata:       metadata,
 		CreatedAt:      model.CreatedAt,
 		UpdatedAt:      model.UpdatedAt,
@@ -55,12 +56,13 @@ func CreateCategoryRequestToEntity(req *models.CreateCategoryRequest) *entities.
 	if req.ImageURL != nil {
 		metadata["image_url"] = *req.ImageURL
 	}
-	metadata["sort_order"] = req.SortOrder
+	// metadata["sort_order"] = req.SortOrder
 
 	return &entities.Category{
 		OrganizationID: req.OrganizationID,
 		Name:           req.Name,
 		Description:    req.Description,
+		Order:          req.Order,
 		BusinessType:   "restaurant", // Default business type
 		Metadata:       metadata,
 	}
@@ -73,7 +75,6 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 
 	// Extract image URL and sort order from metadata
 	var imageURL *string
-	var sortOrder int
 
 	if entity.Metadata != nil {
 		if imgURL, exists := entity.Metadata["image_url"]; exists {
@@ -81,13 +82,6 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 				imageURL = &imgURLStr
 			}
 		}
-		if sort, exists := entity.Metadata["sort_order"]; exists {
-			if sortInt, ok := sort.(int); ok {
-				sortOrder = sortInt
-			} else if sortFloat, ok := sort.(float64); ok {
-				sortOrder = int(sortFloat)
-			}
-		}
 	}
 
 	return &models.CategoryResponse{
@@ -96,7 +90,7 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 		Name:           entity.Name,
 		Description:    entity.Description,
 		ImageURL:       imageURL,
-		SortOrder:      sortOrder,
+		Order:      	entity.Order,
 		IsActive:       true, // Default to true since entity doesn't have this field
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
@@ -124,8 +118,8 @@ func UpdateCategoryEntityFromRequest(entity *entities.Category, req *models.Upda
 		entity.Metadata["image_url"] = *req.ImageURL
 	}
 
-	if req.SortOrder != nil {
-		entity.Metadata["sort_order"] = *req.SortOrder
+	if req.Order != nil {
+		entity.Order = *req.Order
 	}
 }