Feat: Added support for multiple project owners

chaoscenter/authentication/api/handlers/rest/project_handler.go

@@ -55,14 +55,17 @@ func GetUserWithProject(service services.ApplicationService) gin.HandlerFunc {
 
 		outputUser := user.GetUserWithProject()
 
-		projects, err := service.GetProjectsByUserID(outputUser.ID, false)
+		request := utils.GetProjectFilters(c)
+		request.UserID = outputUser.ID
+
+		response, err := service.GetProjectsByUserID(request)
 		if err != nil {
 			log.Error(err)
 			c.JSON(utils.ErrorStatusCodes[utils.ErrServerError], presenter.CreateErrorResponse(utils.ErrServerError))
 			return
 		}
 
-		outputUser.Projects = projects
+		outputUser.Projects = response.Projects
 
 		c.JSON(http.StatusOK, gin.H{"data": outputUser})
 	}
@@ -119,9 +122,10 @@ func GetProject(service services.ApplicationService) gin.HandlerFunc {
 // GetProjectsByUserID queries the project with a given userID from the database and returns it in the appropriate format
 func GetProjectsByUserID(service services.ApplicationService) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		uID := c.MustGet("uid").(string)
-		projects, err := service.GetProjectsByUserID(uID, false)
-		if projects == nil {
+		request := utils.GetProjectFilters(c)
+
+		response, err := service.GetProjectsByUserID(request)
+		if response == nil || (response.TotalNumberOfProjects != nil && *response.TotalNumberOfProjects == 0) {
 			c.JSON(http.StatusOK, gin.H{
 				"message": "No projects found",
 			})
@@ -132,7 +136,7 @@ func GetProjectsByUserID(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}
 
-		c.JSON(http.StatusOK, gin.H{"data": projects})
+		c.JSON(http.StatusOK, gin.H{"data": response})
 	}
 }
 
@@ -300,6 +304,18 @@ func CreateProject(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}
 
+		if userRequest.Description == nil {
+			// If description is not provided, set it to an empty string
+			emptyDescription := ""
+			userRequest.Description = &emptyDescription
+		}
+
+		if userRequest.Tags == nil {
+			// If tags are not provided, set it to an empty slice
+			emptyTags := make([]*string, 0)
+			userRequest.Tags = emptyTags
+		}
+
 		userRequest.UserID = c.MustGet("uid").(string)
 
 		user, err := service.GetUser(userRequest.UserID)
@@ -333,10 +349,12 @@ func CreateProject(service services.ApplicationService) gin.HandlerFunc {
 		members = append(members, newMember)
 		state := "active"
 		newProject := &entities.Project{
-			ID:      pID,
-			Name:    userRequest.ProjectName,
-			Members: members,
-			State:   &state,
+			ID:          pID,
+			Name:        userRequest.ProjectName,
+			Members:     members,
+			State:       &state,
+			Description: userRequest.Description,
+			Tags:        userRequest.Tags,
 			Audit: entities.Audit{
 				IsRemoved: false,
 				CreatedAt: time.Now().UnixMilli(),
@@ -591,7 +609,7 @@ func LeaveProject(service services.ApplicationService) gin.HandlerFunc {
 			c.JSON(utils.ErrorStatusCodes[utils.ErrInvalidRequest], presenter.CreateErrorResponse(utils.ErrInvalidRequest))
 			return
 		}
-		
+
 		if member.Role != nil && *member.Role == entities.RoleOwner {
 			owners, err := service.GetProjectOwners(member.ProjectID)
 			if err != nil {
@@ -605,7 +623,7 @@ func LeaveProject(service services.ApplicationService) gin.HandlerFunc {
 				return
 			}
 		}
-    
+
 		err = validations.RbacValidator(c.MustGet("uid").(string), member.ProjectID,
 			validations.MutationRbacRules["leaveProject"],
 			string(entities.AcceptedInvitation),
@@ -787,7 +805,7 @@ func UpdateMemberRole(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}
 
-
+		
 		// Validating member role
 		if member.Role == nil || (*member.Role != entities.RoleEditor && *member.Role != entities.RoleViewer && *member.Role != entities.RoleOwner) {
 			c.JSON(utils.ErrorStatusCodes[utils.ErrInvalidRole], presenter.CreateErrorResponse(utils.ErrInvalidRole))
@@ -805,13 +823,13 @@ func UpdateMemberRole(service services.ApplicationService) gin.HandlerFunc {
 				presenter.CreateErrorResponse(utils.ErrUnauthorized))
 			return
 		}
-	
+
 		uid := c.MustGet("uid").(string)
 		if uid == member.UserID {
 			c.JSON(http.StatusBadRequest, gin.H{"message": "User cannot change their own role."})
 			return
 		}
-		
+
 		err = service.UpdateMemberRole(member.ProjectID, member.UserID, member.Role)
 		if err != nil {
 			log.Error(err)
@@ -895,7 +913,7 @@ func GetProjectRole(service services.ApplicationService) gin.HandlerFunc {
 
 	}
 }
-	
+
 // DeleteProject  		godoc
 //
 //	@Description	Delete a project.
@@ -930,7 +948,7 @@ func DeleteProject (service services.ApplicationService) gin.HandlerFunc {
 			c.JSON(utils.ErrorStatusCodes[utils.ErrServerError], presenter.CreateErrorResponse(utils.ErrServerError))
 			return
 		}
-		
+
 		c.JSON(http.StatusOK, gin.H{
 			"message": "Successfully deleted project.",
 		})

chaoscenter/authentication/api/handlers/rest/project_handler_test.go

@@ -34,10 +34,15 @@ func TestGetUserWithProject(t *testing.T) {
 			Username: "testUser",
 			Email:    "test@example.com",
 		}
-		project := &entities.Project{}
+		response := &entities.ListProjectResponse{}
+
+		request := &entities.ListProjectRequest{
+			UserID: "testUID",
+		}
+
 
 		service.On("FindUserByUsername", "testUser").Return(user, errors.New("failed"))
-		service.On("GetProjectsByUserID", "testUID", false).Return([]*entities.Project{project}, errors.New("failed"))
+		service.On("GetProjectsByUserID", request).Return(response, errors.New("failed"))
 
 		rest.GetUserWithProject(service)(c)
 
@@ -60,10 +65,31 @@ func TestGetUserWithProject(t *testing.T) {
 			Username: "testUser1",
 			Email:    "test@example.com",
 		}
-		project := &entities.Project{}
+
+		response := &entities.ListProjectResponse{}
+
+		fieldName := entities.ProjectSortingFieldTime
+
+		request := &entities.ListProjectRequest{
+			UserID: "testUID",
+			Pagination: &entities.Pagination{
+				Page:  0,
+				Limit: 15,
+			},
+			Sort: &entities.SortInput{
+				Field:     &fieldName,
+				Ascending: nil,
+			},
+			Filter: &entities.ListProjectInputFilter{
+				CreatedByMe:    nil,
+				InvitedByOthers: nil,
+				ProjectName:    nil,
+			},
+}
+
 
 		service.On("FindUserByUsername", "testUser1").Return(user, nil)
-		service.On("GetProjectsByUserID", "testUID", false).Return([]*entities.Project{project}, nil)
+		service.On("GetProjectsByUserID", request).Return(response, nil)
 
 		rest.GetUserWithProject(service)(c)
 
@@ -87,10 +113,29 @@ func TestGetUserWithProject(t *testing.T) {
 			Email:    "test@example.com",
 			Role:     entities.RoleAdmin,
 		}
-		project := &entities.Project{}
+		response := &entities.ListProjectResponse{}
+
+		fieldName := entities.ProjectSortingFieldTime
+
+		request := &entities.ListProjectRequest{
+			UserID: "testUID",
+			Pagination: &entities.Pagination{
+				Page:  0,
+				Limit: 15,
+			},
+			Sort: &entities.SortInput{
+				Field:     &fieldName,
+				Ascending: nil,
+			},
+			Filter: &entities.ListProjectInputFilter{
+				CreatedByMe:    nil,
+				InvitedByOthers: nil,
+				ProjectName:    nil,
+			},
+		}
 
 		service.On("FindUserByUsername", "testUser").Return(user, nil)
-		service.On("GetProjectsByUserID", "testUID", false).Return([]*entities.Project{project}, nil)
+		service.On("GetProjectsByUserID", request).Return(response, nil)
 
 		rest.GetUserWithProject(service)(c)
 
@@ -106,14 +151,30 @@ func TestGetProjectsByUserID(t *testing.T) {
 		w := httptest.NewRecorder()
 		ctx := GetTestGinContext(w)
 		ctx.Set("uid", "testUserID")
-		projects := []*entities.Project{
-			{
-				ID:   "testProjectID",
-				Name: "Test Project",
+
+		response := &entities.ListProjectResponse{}
+
+		fieldName := entities.ProjectSortingFieldTime
+
+		request := &entities.ListProjectRequest{
+			UserID: "testUserID",
+			Pagination: &entities.Pagination{
+				Page:  0,
+				Limit: 15,
+			},
+			Sort: &entities.SortInput{
+				Field:     &fieldName,
+				Ascending: nil,
+			},
+			Filter: &entities.ListProjectInputFilter{
+				CreatedByMe:    nil,
+				InvitedByOthers: nil,
+				ProjectName:    nil,
 			},
 		}
+
 		service := new(mocks.MockedApplicationService)
-		service.On("GetProjectsByUserID", "testUserID", false).Return(projects, errors.New("Failed"))
+		service.On("GetProjectsByUserID", request).Return(response, errors.New("Failed"))
 		rest.GetProjectsByUserID(service)(ctx)
 		assert.Equal(t, utils.ErrorStatusCodes[utils.ErrServerError], w.Code)
 	})
@@ -129,8 +190,32 @@ func TestGetProjectsByUserID(t *testing.T) {
 				Name: "Test Project",
 			},
 		}
+
+		response := &entities.ListProjectResponse{
+			Projects: projects,
+		}
+
+		fieldName := entities.ProjectSortingFieldTime
+
+		request := &entities.ListProjectRequest{
+			UserID: "testUserID",
+			Pagination: &entities.Pagination{
+				Page:  0,
+				Limit: 15,
+			},
+			Sort: &entities.SortInput{
+				Field:     &fieldName,
+				Ascending: nil,
+			},
+			Filter: &entities.ListProjectInputFilter{
+				CreatedByMe:    nil,
+				InvitedByOthers: nil,
+				ProjectName:    nil,
+			},
+		}
+
 		service := new(mocks.MockedApplicationService)
-		service.On("GetProjectsByUserID", "testUserID", false).Return(projects, nil)
+		service.On("GetProjectsByUserID", request).Return(response, nil)
 		rest.GetProjectsByUserID(service)(ctx)
 		assert.Equal(t, http.StatusOK, w.Code)
 	})

chaoscenter/authentication/api/mocks/rest_mocks.go

@@ -90,9 +90,9 @@ func (m *MockedApplicationService) GetProjects(query bson.D) ([]*entities.Projec
 	return args.Get(0).([]*entities.Project), args.Error(1)
 }
 
-func (m *MockedApplicationService) GetProjectsByUserID(uid string, isOwner bool) ([]*entities.Project, error) {
-	args := m.Called(uid, isOwner)
-	return args.Get(0).([]*entities.Project), args.Error(1)
+func (m *MockedApplicationService) GetProjectsByUserID(request *entities.ListProjectRequest) (*entities.ListProjectResponse, error) {
+	args := m.Called(request)
+	return args.Get(0).(*entities.ListProjectResponse), args.Error(1)
 }
 
 func (m *MockedApplicationService) GetProjectStats() ([]*entities.ProjectStats, error) {
@@ -213,4 +213,4 @@ func (m *MockedApplicationService) RbacValidator(userID, resourceID string, rule
 func (m *MockedApplicationService) DeleteProject(projectID string) error {
 	args := m.Called(projectID)
 	return args.Error(0)
-}
+}