feat(Request User) added user/me and user/delete

server/.env.server.example

@@ -4,4 +4,4 @@ DB_PORT=3306
 DB_NAME=area
 DB_USER=root
 DB_PASSWORD=change-me
-RMQ_URL="amqp://root:root@localhost:5672/"
+RMQ_URL="amqp://guest:guest@localhost:5000/"

server/internal/controllers/user.go

@@ -0,0 +1,45 @@
+package controllers
+
+import (
+	"AREA/internal/models"
+	"AREA/internal/pkg"
+	"github.com/gin-gonic/gin"
+)
+
+func UserMe(c *gin.Context) {
+	user, err := pkg.GetUserFromToken(c)
+	if err != nil {
+		c.JSON(500, gin.H{"error": "Failed to fetch user"})
+		return
+	}
+	pkg.DB.Preload("Tokens").First(&user)
+
+	var services []models.ServiceRequest
+	for _, token := range user.Tokens {
+		var service models.Service
+		pkg.DB.Where("id = ?", token.ServiceID).First(&service)
+		services = append(services, models.ServiceRequest{
+			Name: service.Name,
+			ID:   service.ID,
+		})
+	}
+
+	var userData = models.UserRequest{
+		Username: user.Username,
+		Email:    user.Email,
+		Services: services,
+	}
+	c.JSON(200, gin.H{"user": userData})
+}
+func UserDelete(c *gin.Context) {
+	user, err := pkg.GetUserFromToken(c)
+	if err != nil {
+		c.JSON(500, gin.H{"error": "Failed to fetch user"})
+		return
+	}
+	if err := pkg.DB.Unscoped().Delete(&user).Error; err != nil {
+		c.JSON(500, gin.H{"error": "Failed to delete user", "details": err.Error()})
+		return
+	}
+	c.JSON(200, gin.H{"success": "User deleted"})
+}

server/internal/controllers/workflow.go

@@ -67,14 +67,14 @@ func WorkflowCreate(c *gin.Context) {
 		c.JSON(400, gin.H{"error": err.Error()})
 		return
 	}
-	userID, err := pkg.GetUserFromToken(c)
+	user, err := pkg.GetUserFromToken(c)
 	if err != nil {
 		c.JSON(401, gin.H{"error": "Unauthorized"})
 		return
 	}
 
 	workflow := models.Workflow{
-		UserID:      userID,
+		UserID:      user.ID,
 		Name:        request.Name,
 		Description: request.Description,
 		Status:      models.WorkflowStatusPending,
@@ -125,12 +125,12 @@ func WorkflowCreate(c *gin.Context) {
 // @Router       /workflow/list [get]
 func WorkflowList(c *gin.Context) {
 	var workflows []models.Workflow
-	userID, err := pkg.GetUserFromToken(c)
+	user, err := pkg.GetUserFromToken(c)
 	if err != nil {
 		return
 	}
 	err = pkg.DB.Preload("WorkflowEvents.ParametersValues").
-		Where("user_id = ?", userID).
+		Where("user_id = ?", user.ID).
 		Find(&workflows).Error
 
 	if err != nil {
@@ -173,3 +173,19 @@ func WorkflowDelete(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, gin.H{"message": "Workflow deleted successfully"})
 }
+
+func WorkflowGet(c *gin.Context) {
+	idParam := c.Param("id")
+	workflowID, err := strconv.Atoi(idParam)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid workflow ID"})
+		return
+	}
+	var workflow models.Workflow
+	result := pkg.DB.Preload("WorkflowEvents.ParametersValues").First(&workflow, workflowID)
+	if result.Error != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "Workflow not found"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"workflow": workflow})
+}

server/internal/models/requests.go

@@ -27,3 +27,32 @@ type WorkflowCreationRequest struct {
 		} `json:"parameters"`
 	} `json:"events"`
 }
+
+type ServiceRequest struct {
+	ID   uint   `json:"id"`
+	Name string `json:"name"`
+}
+
+type UserRequest struct {
+	Username string           `json:"username"`
+	Email    string           `json:"email"`
+	Services []ServiceRequest `json:"services"`
+}
+
+type WorkflowPutRequest struct {
+	Name        string        `json:"name"`
+	Description string        `json:"description"`
+	Services    []interface{} `json:"services"`
+	Events      []struct {
+		Id          int    `json:"id"`
+		Name        string `json:"name"`
+		Type        string `json:"type"`
+		Description string `json:"description"`
+		Parameters  []struct {
+			Name  string `json:"name"`
+			Type  string `json:"type"`
+			Value string `json:"value"`
+		} `json:"parameters"`
+	} `json:"events"`
+	IsActive bool `json:"is_active"`
+}

server/internal/pkg/token.go

@@ -8,23 +8,23 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func GetUserFromToken(c *gin.Context) (uint, error) {
+func GetUserFromToken(c *gin.Context) (models.User, error) {
 	email, err := utils.VerifyToken(c)
 	if err != nil {
-		return 0, err
+		return models.User{}, err
 	}
 	user := models.User{}
 	DB.Where("email = ?", email).First(&user)
 	if user.ID == 0 {
-		return 0, errors.New("User not found")
+		return models.User{}, errors.New("User not found")
 	}
-	return user.ID, nil
+	return user, nil
 }
 
 func GetServiceFromName(serviceName string) (uint, error) {
-        var service models.Service
-        if err := DB.Where("name = ?", serviceName).First(&service).Error; err != nil {
-                return 0, errors.New("Service not found")
-        }
-        return service.ID, nil
+	var service models.Service
+	if err := DB.Where("name = ?", serviceName).First(&service).Error; err != nil {
+		return 0, errors.New("service not found")
+	}
+	return service.ID, nil
 }

server/internal/routers/routers.go

@@ -11,8 +11,8 @@ import (
 )
 
 func setUpOauthGroup(router *gin.Engine) {
-        router.POST("/oauth/:service", controllers.OAuth)
-        //router.POST("/oauth/bind/:service", controllers.OAuthBind)
+	router.POST("/oauth/:service", controllers.OAuth)
+	//router.POST("/oauth/bind/:service", controllers.OAuthBind)
 }
 
 func setUpAuthGroup(router *gin.Engine) {
@@ -31,6 +31,16 @@ func setUpWorkflowGroup(router *gin.Engine) {
 		workflow.POST("/create", controllers.WorkflowCreate)
 		workflow.GET("/list", controllers.WorkflowList)
 		workflow.DELETE("/delete/:id", controllers.WorkflowDelete)
+		workflow.GET("/:id", controllers.WorkflowGet)
+	}
+}
+
+func setUpUserGroup(router *gin.Engine) {
+	user := router.Group("/user")
+	user.Use(middleware.AuthMiddleware())
+	{
+		user.GET("/me", controllers.UserMe)
+		user.DELETE("/delete", controllers.UserDelete)
 	}
 }
 
@@ -50,6 +60,7 @@ func SetupRouter() *gin.Engine {
 	}
 	setUpAuthGroup(router)
 	setUpOauthGroup(router)
+	setUpUserGroup(router)
 	setUpWorkflowGroup(router)
 	protected := router.Group("/")
 	protected.Use(middleware.AuthMiddleware())