Merge pull request #5 from RECYTHNG/develop

Develop
RECYTHNG · Jun 9, 2024 · a45a2bc · a45a2bc
2 parents d85b8f3 + 5a27fb9
commit a45a2bc
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 303 deletions.
diff --git a/docs/swagger.yml b/docs/swagger.yml
@@ -1079,116 +1079,8 @@ paths:
                     example: article successfully deleted!
         '404':
           description: Article not found
-  /achievements/badge:
-    post:
-      tags:
-        - manage achievements
-      summary: Upload image badge
-      description: Endpoint admin to upload image badge before adding or updating data achievement.
-      operationId: uploadImageBadge
-      security:
-        - Bearer: []
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              type: object
-              properties:
-                badge:
-                  type: string
-                  format: image
-                  description: Image badge
-      responses:
-        '200':
-          description: Upload Success
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  code:
-                    type: integer
-                    example: 200
-                  message:
-                    type: string
-                    example: ok
-                  data:
-                    type: object
-                    properties:
-                      badge_url:
-                        type: string
-                        example: https://example.com/image.png
-        '400':
-          description: Invalid request data
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  code:
-                    type: integer
-                    example: 400
-                  message:
-                    type: string
-                    example: Invalid data type
+
   /achievements:
-    # post:
-    #   tags:
-    #     - manage achievements
-    #   summary: Add new achievement
-    #   description: Endpoint admin to add a new achievement
-    #   operationId: addAchievement
-    #   security:
-    #     - Bearer: []
-    #   requestBody:
-    #     required: true
-    #     content:
-    #       application/json:
-    #         schema:
-    #           type: object
-    #           properties:
-    #             level:
-    #               type: string
-    #               description: Level of the achievement
-    #               example: gold
-    #             targetPoint:
-    #               type: integer
-    #               description: Target point of the achievement
-    #               example: 1200
-    #             badge_url:
-    #               type: string
-    #               description: Badge url of the achievement
-    #               example: https://example.com/image.png
-    #   responses:
-    #     '201':
-    #       description: Achievement successfully created!
-    #       content:
-    #         application/json:
-    #           schema:
-    #             type: object
-    #             properties:
-    #               code:
-    #                 type: integer
-    #                 example: 201
-    #               message:
-    #                 type: string
-    #                 example: achievement successfully created!
-    #               data:
-    #                 type: object
-    #                 properties:
-    #                   id:
-    #                     type: string
-    #                     example: ACH0001
-    #                   level:
-    #                     type: string
-    #                     example: gold
-    #                   targetPoint:
-    #                     type: integer
-    #                     example: 1200
-    #                   badge_url:
-    #                     type: string
-    #                     example: https://example.com/image.png
     get:
       tags:
         - manage achievements
@@ -1218,7 +1110,7 @@ paths:
     get:
       tags:
         - manage achievements
-      summary: Get an achievement by id
+      summary: Get achievement by id
       description: Endpoint admin to get an existing achievement's data by id
       operationId: getAchievementById
       parameters:
@@ -1280,22 +1172,26 @@ paths:
       requestBody:
         required: true
         content:
-          application/json:
+          multipart/form-data::
             schema:
               type: object
               properties:
-                level:
-                  type: string
-                  description: New level for the achievement
-                  example: platinum
-                target_point:
-                  type: integer
-                  description: New target point for the badge
-                  example: 1200
-                badge_url:
+                json_data:
+                  type: object
+                  properties:
+                    level:
+                      type: string
+                      description: New level for the achievement
+                      example: platinum
+                    target_point:
+                      type: integer
+                      description: New target point for the badge
+                      example: 1200
+                badge:
                   type: string
-                  description: New badge url for the achievement
-                  example: https://example.com/image.png
+                  format: binary
+                  description: Image of the badge
+                  example: image
       responses:
         '200':
           description: Achievement successfully updated
@@ -1638,7 +1534,7 @@ paths:
                             example: "Step 1 description"
                 thumbnail:
                   type: string
-                  format: image
+                  format: binary
                   example: "thumbnail.jpg"
 
       responses:
@@ -1973,7 +1869,7 @@ paths:
                             example: "Step 1 description"
                 thumbnail:
                   type: string
-                  format: image
+                  format: binary
                   example: "thumbnail.jpg"
       responses:
         '200':
@@ -2461,7 +2357,7 @@ paths:
                   type: array
                   items:
                     type: string
-                    format: image
+                    format: binary
                   example: ["image1.jpg", "image2.jpg"]
       responses:
         '200':
@@ -2578,7 +2474,7 @@ paths:
                   type: array
                   items:
                     type: string
-                    format: image
+                    format: binary
                   example: ["image1.jpg", "image2.jpg"]
       responses:
         '200':
@@ -3202,7 +3098,7 @@ paths:
                       example: 1
                 thumbnail:
                   type: string
-                  format: image
+                  format: binary
                   example: "thumbnail.jpg"
 
       responses:
@@ -3431,7 +3327,7 @@ paths:
                       example: 1
                 thumbnail:
                   type: string
-                  format: image
+                  format: binary
                   example: "thumbnail.jpg"
 
       responses:
@@ -4345,7 +4241,7 @@ components:
           example: admin
         profile_photo:
           type: string
-          format: image
+          format: binary
           example: "profile.jpg"
     EditAdmin:
       type: object
@@ -4368,7 +4264,7 @@ components:
           example: admin
         profile_photo:
           type: string
-          format: image
+          format: binary
           example: "profile.jpg"
     AdminResponse:
       type: object

diff --git a/internal/achievements/manage_achievements/dto/manage_achievement_request.go b/internal/achievements/manage_achievements/dto/manage_achievement_request.go
@@ -1,13 +1,9 @@
 package dto
 
-type CreateArchievementRequest struct {
-	Level       string `json:"level" validate:"required"`
-	TargetPoint int    `json:"target_point" validate:"required"`
-	BadgeUrl    string `json:"badge_url" validate:"required"`
-}
+import "mime/multipart"
 
 type UpdateAchievementRequest struct {
-	Level       string `json:"level" validate:"required"`
-	TargetPoint int    `json:"target_point" validate:"required"`
-	BadgeUrl    string `json:"badge_url" validate:"required"`
+	Level       string                `json:"level" validate:"required"`
+	TargetPoint int                   `json:"target_point" validate:"required"`
+	Badge       *multipart.FileHeader `json:"-"`
 }
diff --git a/internal/achievements/manage_achievements/dto/manage_achievement_response.go b/internal/achievements/manage_achievements/dto/manage_achievement_response.go
@@ -1,15 +1,5 @@
 package dto
 
-type CreateArchievementResponse struct {
-	Level       string `json:"level"`
-	TargetPoint int    `json:"target_point"`
-	BadgeUrl    string `json:"badge_url"`
-}
-
-type UploadBadgeResponse struct {
-	BadgeUrl string `json:"badge_url"`
-}
-
 type DataAchievement struct {
 	Id          int    `json:"id"`
 	Level       string `json:"level"`

diff --git a/internal/achievements/manage_achievements/handler/manage_achievement_handler.go b/internal/achievements/manage_achievements/handler/manage_achievement_handler.go
@@ -3,11 +3,8 @@ package handler
 import "github.com/labstack/echo/v4"
 
 type ManageAchievementHandler interface {
-	UploadBadgeHandler(c echo.Context) error
-	CreateAchievementHandler(c echo.Context) error
 	GetAllAchievementHandler(c echo.Context) error
 	GetAchievementByIdHandler(c echo.Context) error
 	UpdateAchievementHandler(c echo.Context) error
-	UpdateBadgeHandler(c echo.Context) error
 	DeleteAchievementHandler(c echo.Context) error
 }