feat: update for position in ppid data, files, category

app/module/ppid_data_files/controller/ppid_data_files.controller.go

@@ -6,11 +6,9 @@ import (
 	"go-humas-be/app/module/ppid_data_files/request"
 	"go-humas-be/app/module/ppid_data_files/service"
 	"go-humas-be/utils/paginator"
-	"strconv"
-	"time"
-
 	utilRes "go-humas-be/utils/response"
 	utilVal "go-humas-be/utils/validator"
+	"strconv"
 )
 
 type ppidDataFilesController struct {
@@ -167,8 +165,8 @@ func (_i *ppidDataFilesController) Update(c *fiber.Ctx) error {
 }
 
 // UpdatePosition PpidDataFiles
-// @Summary      UpdatePosition PpidDataFiles
+// @Summary      updatePosition PpidDataFiles
-// @Description  API for Update Position PpidDataFiles
+// @Description  API for PpidDataFiles
 // @Tags         PPID Files
 // @Security     Bearer
 // @Param 	     payload body request.PpidDataFilesUpdatePositionPayload true "Required payload"
@@ -176,31 +174,17 @@ func (_i *ppidDataFilesController) Update(c *fiber.Ctx) error {
 // @Failure      400  {object}  response.BadRequestError
 // @Failure      401  {object}  response.UnauthorizedError
 // @Failure      500  {object}  response.InternalServerError
-// @Router       /ppid-data-files/position [post]
+// @Router       /ppid-data-files/update/position [post]
 func (_i *ppidDataFilesController) UpdatePosition(c *fiber.Ctx) error {
+	req := new(request.PpidDataFilesUpdatePositionPayload)
+	if err := utilVal.ParseAndValidate(c, req); err != nil {
+		return err
+	}
 
-	_i.Log.Info().Str("timestamp", time.Now().
+	err := _i.ppidDataFilesService.UpdatePosition(req.Positions)
-		Format(time.RFC3339)).Str("Service:All", "ppidDataFilesController").
+	if err != nil {
-		Interface("req", "TEST").Msg("")
+		return err
-
+	}
-	//req := new(request.PpidDataFilesUpdatePositionPayload)
-	//
-	//_i.Log.Info().Str("timestamp", time.Now().
-	//	Format(time.RFC3339)).Str("Service:All", "ppidDataCategoriesController").
-	//	Interface("req", "TEST").Msg("")
-	//
-	//if err := utilVal.ParseAndValidate(c, req); err != nil {
-	//	return err
-	//}
-	//
-	//_i.Log.Info().Str("timestamp", time.Now().
-	//	Format(time.RFC3339)).Str("Service:All", "ppidDataCategoriesController").
-	//	Interface("req", req).Msg("")
-	//
-	//err := _i.ppidDataFilesService.UpdatePosition(req.Positions)
-	//if err != nil {
-	//	return err
-	//}
 
 	return utilRes.Resp(c, utilRes.Response{
 		Success:  true,

app/module/ppid_data_files/mapper/ppid_data_files.mapper.go

@@ -18,6 +18,7 @@ func PpidDataFilesResponseMapper(ppidDataFilesReq *entity.PpidDataFiles) (ppidDa
 			FileUrl:       fileUrl,
 			FileType:      ppidDataFilesReq.FileType,
 			DownloadCount: ppidDataFilesReq.DownloadCount,
+			Position:      ppidDataFilesReq.Position,
 			CreatedById:   ppidDataFilesReq.CreatedById,
 			StatusId:      ppidDataFilesReq.StatusId,
 			IsPublish:     ppidDataFilesReq.IsPublish,

app/module/ppid_data_files/ppid_data_files.module.go

@@ -48,7 +48,7 @@ func (_i *PpidDataFilesRouter) RegisterPpidDataFilesRoutes() {
 		router.Get("/:id", ppidDataFilesController.Show)
 		router.Post("/:ppidDataId", ppidDataFilesController.Save)
 		router.Put("/:id", ppidDataFilesController.Update)
-		router.Post("/position", ppidDataFilesController.UpdatePosition)
+		router.Post("/update/position", ppidDataFilesController.UpdatePosition)
 		router.Delete("/:id", ppidDataFilesController.Delete)
 		router.Get("/viewer/:filename", ppidDataFilesController.Viewer)
 	})

app/module/ppid_data_files/request/ppid_data_files.request.go

@@ -78,8 +78,8 @@ type PpidDataFilesUpdatePositionPayload struct {
 }
 
 type PpidDataFilesUpdatePositionRequest struct {
-	ID       uint `json:"id"`
+	ID       uint `json:"id" validate:"required"`
-	Position int  `json:"position"`
+	Position int  `json:"position"  validate:"required"`
 }
 
 func (req PpidDataFilesUpdatePositionRequest) ToEntity() *entity.PpidDataFiles {

app/module/ppid_data_files/response/ppid_data_files.response.go

@@ -11,10 +11,11 @@ type PpidDataFilesResponse struct {
 	FileUrl       string     `json:"fileUrl"`
 	DownloadCount *int       `json:"downloadCount"`
 	CreatedById   *int       `json:"createdById"`
-	StatusId      *int       `json:"status_id"`
+	Position      *int       `json:"position"`
-	IsPublish     *bool      `json:"is_publish"`
+	StatusId      *int       `json:"statusId"`
-	PublishedAt   *time.Time `json:"published_at"`
+	IsPublish     *bool      `json:"isPublish"`
-	IsActive      *bool      `json:"is_active"`
+	PublishedAt   *time.Time `json:"publishedAt"`
-	CreatedAt     time.Time  `json:"created_at"`
+	IsActive      *bool      `json:"isActive"`
-	UpdatedAt     time.Time  `json:"updated_at"`
+	CreatedAt     time.Time  `json:"createdAt"`
+	UpdatedAt     time.Time  `json:"updatedAt"`
 }

app/module/ppid_datas/mapper/ppid_datas.mapper.go

@@ -53,6 +53,7 @@ func PpidDatasResponseMapper(
 			CategoryName:  &categoryName,
 			CreatedById:   ppidDatasReq.CreatedById,
 			CreatedByName: &createdByName,
+			Position:      ppidDatasReq.Position,
 			StatusId:      ppidDatasReq.StatusId,
 			IsPublish:     ppidDatasReq.IsPublish,
 			PublishedAt:   ppidDatasReq.PublishedAt,

app/module/ppid_datas/response/ppid_datas.response.go

@@ -17,6 +17,7 @@ type PpidDatasResponse struct {
 	StatusId      int        `json:"statusId"`
 	StatusName    int        `json:"statusName"`
 	IsPublish     *bool      `json:"isPublish"`
+	Position      *int       `json:"position"`
 	PublishedAt   *time.Time `json:"publishedAt"`
 	IsActive      *bool      `json:"isActive"`
 	CreatedAt     time.Time  `json:"createdAt"`

docs/swagger/docs.go

@@ -4253,18 +4253,18 @@ const docTemplate = `{
                 }
             }
         },
-        "/ppid-data-files/position": {
+        "/ppid-data-files/update/position": {
             "post": {
                 "security": [
                     {
                         "Bearer": []
                     }
                 ],
-                "description": "API for Update Position PpidDataFiles",
+                "description": "API for PpidDataFiles",
                 "tags": [
                     "PPID Files"
                 ],
-                "summary": "UpdatePosition PpidDataFiles",
+                "summary": "updatePosition PpidDataFiles",
                 "parameters": [
                     {
                         "description": "Required payload",
@@ -7223,6 +7223,10 @@ const docTemplate = `{
         },
         "request.PpidDataFilesUpdatePositionRequest": {
             "type": "object",
+            "required": [
+                "id",
+                "position"
+            ],
             "properties": {
                 "id": {
                     "type": "integer"

docs/swagger/swagger.json

@@ -4242,18 +4242,18 @@
                 }
             }
         },
-        "/ppid-data-files/position": {
+        "/ppid-data-files/update/position": {
             "post": {
                 "security": [
                     {
                         "Bearer": []
                     }
                 ],
-                "description": "API for Update Position PpidDataFiles",
+                "description": "API for PpidDataFiles",
                 "tags": [
                     "PPID Files"
                 ],
-                "summary": "UpdatePosition PpidDataFiles",
+                "summary": "updatePosition PpidDataFiles",
                 "parameters": [
                     {
                         "description": "Required payload",
@@ -7212,6 +7212,10 @@
         },
         "request.PpidDataFilesUpdatePositionRequest": {
             "type": "object",
+            "required": [
+                "id",
+                "position"
+            ],
             "properties": {
                 "id": {
                     "type": "integer"

docs/swagger/swagger.yaml

@@ -301,6 +301,9 @@ definitions:
         type: integer
       position:
         type: integer
+    required:
+    - id
+    - position
     type: object
   request.PpidDataFilesUpdateRequest:
     properties:
@@ -3476,9 +3479,9 @@ paths:
       summary: Create PpidDataFiles
       tags:
       - PPID Files
-  /ppid-data-files/position:
+  /ppid-data-files/update/position:
     post:
-      description: API for Update Position PpidDataFiles
+      description: API for PpidDataFiles
       parameters:
       - description: Required payload
         in: body
@@ -3505,7 +3508,7 @@ paths:
             $ref: '#/definitions/response.InternalServerError'
       security:
       - Bearer: []
-      summary: UpdatePosition PpidDataFiles
+      summary: updatePosition PpidDataFiles
       tags:
       - PPID Files
   /ppid-data-files/viewer/{filename}: