Merge pull request #13 from jason810496/main

add: add post router for user unsubscribe event
peterxcli · Feb 18, 2024 · 3999871 · 3999871
2 parents f4dfed7 + 3664dbf
commit 3999871
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 25 deletions.
diff --git a/docs/.swagger-codegen-ignore b/docs/.swagger-codegen-ignore
diff --git a/docs/.swagger-codegen/VERSION b/docs/.swagger-codegen/VERSION
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/docs.go b/docs/docs.go
@@ -427,6 +427,49 @@ const docTemplate = `{
                 }
             }
         },
+        "/users/events/delete/{event_id}": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "Deletes a specific event by its ID for a given user",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "Delete event",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Event ID",
+                        "name": "event_id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Event successfully deleted",
+                        "schema": {
+                            "$ref": "#/definitions/bikefest_pkg_model.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/bikefest_pkg_model.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/users/events/{event_id}": {
             "delete": {
                 "security": [

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -416,6 +416,49 @@
                 }
             }
         },
+        "/users/events/delete/{event_id}": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "Deletes a specific event by its ID for a given user",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "Delete event",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Event ID",
+                        "name": "event_id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Event successfully deleted",
+                        "schema": {
+                            "$ref": "#/definitions/bikefest_pkg_model.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/bikefest_pkg_model.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/users/events/{event_id}": {
             "delete": {
                 "security": [

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -451,6 +451,33 @@ paths:
         event notification to user immediately
       tags:
       - User
+  /users/events/delete/{event_id}:
+    post:
+      consumes:
+      - application/json
+      description: Deletes a specific event by its ID for a given user
+      parameters:
+      - description: Event ID
+        in: path
+        name: event_id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: Event successfully deleted
+          schema:
+            $ref: '#/definitions/bikefest_pkg_model.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/bikefest_pkg_model.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: Delete event
+      tags:
+      - User
   /users/login/{user_id}:
     get:
       consumes:

diff --git a/pkg/controller/user_controller.go b/pkg/controller/user_controller.go
@@ -465,6 +465,43 @@ func (ctrl *UserController) UnScribeEvent(c *gin.Context) {
 	})
 }
 
+
+// UnScribeEvent godoc
+// @Summary Delete event
+// @Description Deletes a specific event by its ID for a given user
+// @Tags User
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param event_id path string true "Event ID"
+// @Success 200 {object} model.Response "Event successfully deleted"
+// @Failure 500 {object} model.Response "Internal Server Error"
+// @Router /users/events/delete/{event_id} [post]
+func (ctrl *UserController) UnScribeDeleteEvent(c *gin.Context) {
+	identity, _ := RetrieveIdentity(c, true)
+	userID := identity.UserID
+	eventID := c.Param("event_id")
+	err := ctrl.userSvc.UnsubscribeEvent(c, userID, eventID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusInternalServerError, model.Response{
+			Msg: err.Error(),
+		})
+		return
+	}
+
+	err = ctrl.asynqService.DeleteEventNotification(c, userID+eventID)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusInternalServerError, model.Response{
+			Msg: err.Error(),
+		})
+		return
+	}
+
+	c.JSON(200, model.Response{
+		Msg: "Delete success",
+	})
+}
+
 // GetUserSubscribeEvents godoc
 // @Summary Get User Events
 // @Description Retrieves a list of events associated with a user

diff --git a/pkg/middleware/cors.go b/pkg/middleware/cors.go
@@ -5,7 +5,8 @@ import "github.com/gin-gonic/gin"
 func CORSMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		//TODO: add production frontend url in allow origin
-		c.Writer.Header().Set("Access-Control-Allow-Origin", "http://localhost:5173")
+		origin := c.Request.Header.Get("Origin")
+		c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
 		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
 		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Content-Range, Accept-Ranges, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With, grant_type, code")
 		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT, DELETE")

diff --git a/pkg/router/user_route.go b/pkg/router/user_route.go
@@ -22,4 +22,6 @@ func RegisterUserRoutes(app *bootstrap.Application, controller *controller.UserC
 	r.POST("/events", authMiddleware, controller.SubscribeEvent)
 	r.POST("/events/all", authMiddleware, controller.SubscribeAllEvent)
 	r.DELETE("/events/:event_id", authMiddleware, controller.UnScribeEvent)
+
+	r.POST("/events/delete/:event_id", authMiddleware, controller.UnScribeDeleteEvent)
 }