grouptasks pagination

modules/equipment/equipment.go

@@ -191,7 +191,7 @@ func GetEquipmentDocumentations(stockItemId string, query structs.PageQuery, c *
 			return c.SendStatus(fiber.StatusInternalServerError)
 		}
 	} else {
-		totalPages = utils.GetTotalPages(&documentations, stockItemId, "stock_item_id = ?", stockItemId)
+		totalPages = utils.GetTotalPages(&documentations, "stock_item_id = ?", stockItemId)
 	}
 
 	logger.AddSystemLog(structs.LogMessage{

modules/structs/grouptasks.go

@@ -110,7 +110,7 @@ type GroupTasksRequest struct {
 
 // swagger:model GroupTasksResponse
 type GroupTasksResponse struct {
-	CategoryGroups  []CategoryGroup
+	CategoryGroup CategoryGroup
-	GroupTasks      []GroupTasks
+	GroupTasks    []GroupTasks
-	GroupTasksSteps []GroupTaskSteps
+	TotalPages    int
 }

modules/utils/globals.go

@@ -37,7 +37,7 @@ const (
 	ConnectionStateOnline  = 1
 
 	EquipmentDocumentationsPaginationLimit = 3
-	GroupTasksPaginationLimit              = 10
+	GroupTasksPaginationLimit              = 5
 )
 
 var (

modules/utils/utils.go

@@ -115,8 +115,8 @@ func QueryParserHelper(c *fiber.Ctx, query interface{}) error {
 }
 
 // GetTotalPages returns total pages for pagination
-// Example Where("stock_item_id = ?", stockItemId) -> whereQuery = "stock_item_id = ?" and whereQuery = stockItemId
+// Example whereQuery = "stock_item_id = ?" and args = stockItemId is Where("stock_item_id = ?", stockItemId)
-func GetTotalPages(any interface{}, stockItemId string, whereQuery interface{}, args ...interface{}) int {
+func GetTotalPages(any interface{}, whereQuery interface{}, args ...interface{}) int {
 	var totalPages int64
 
 	database.DB.Model(any).

routers/router/api/v1/grouptasks/grouptasks.go

@@ -28,10 +28,18 @@ func GetGroupTasks(c *fiber.Ctx) error {
 	log.Info().Msgf("params: %v", params)
 	log.Info().Msgf("query: %v", query)
 
+	var categoryGroup structs.CategoryGroup
+
+	for _, cGroup := range cache.GetCategoryGroups() {
+		if cGroup.Category == params.Category {
+			categoryGroup = cGroup
+		}
+	}
+
 	return c.JSON(structs.GroupTasksResponse{
-		CategoryGroups:  cache.GetCategoryGroupsSorted(),
+		CategoryGroup: categoryGroup,
-		GroupTasks:      grouptasks.GetAllGroupTasks(params.Category, query),
+		GroupTasks:    grouptasks.GetAllGroupTasks(params.Category, query),
-		GroupTasksSteps: grouptasks.GetAllGroupTasksSteps(),
+		TotalPages:    utils.GetTotalPages([]structs.GroupTasks{}, "category = ?", params.Category),
 	})
 }