andoriyaprashant
diff --git a/‎chaoscenter/authentication/api/handlers/rest/project_handler.go‎
Lines changed: 45 additions & 14 deletions b/‎chaoscenter/authentication/api/handlers/rest/project_handler.go‎
Lines changed: 45 additions & 14 deletions
diff --git a/‎chaoscenter/authentication/api/handlers/rest/project_handler_test.go‎
Lines changed: 95 additions & 12 deletions b/‎chaoscenter/authentication/api/handlers/rest/project_handler_test.go‎
Lines changed: 95 additions & 12 deletions
diff --git a/‎chaoscenter/authentication/api/mocks/rest_mocks.go‎
Lines changed: 3 additions & 3 deletions b/‎chaoscenter/authentication/api/mocks/rest_mocks.go‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎chaoscenter/authentication/api/types/project_types.go‎
Lines changed: 17 additions & 0 deletions b/‎chaoscenter/authentication/api/types/project_types.go‎
Lines changed: 17 additions & 0 deletions
@@ -5,6 +5,8 @@ import (
 	"time"
 
 	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/types"
+	project_utils "github.com/litmuschaos/litmus/chaoscenter/authentication/api/utils"
 	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
 	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
@@ -53,16 +55,23 @@ func GetUserWithProject(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}
 
-		outputUser := user.GetUserWithProject()
+		request := project_utils.GetProjectFilters(c)
+		request.UserID = user.ID
 
-		projects, err := service.GetProjectsByUserID(outputUser.ID, false)
+		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 := &entities.UserWithProject{
+			Username: user.Username,
+			ID:       user.ID,
+			Email:    user.Email,
+			Name:     user.Name,
+			Projects: response.Projects,
+		}
 
 		c.JSON(http.StatusOK, gin.H{"data": outputUser})
 	}
@@ -122,9 +131,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 := project_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",
 			})
@@ -135,7 +145,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})
 	}
 }
 
@@ -309,6 +319,7 @@ func CreateProject(service services.ApplicationService) gin.HandlerFunc {
 			c.JSON(utils.ErrorStatusCodes[utils.ErrInvalidRequest], presenter.CreateErrorResponse(utils.ErrInvalidRequest))
 			return
 		}
+		userRequest.UserID = c.MustGet("uid").(string)
 
 		// admin/user shouldn't be able to perform any task if it's default pwd is not changes(initial login is true)
 		initialLogin, err := CheckInitialLogin(service, userRequest.UserID)
@@ -324,7 +335,17 @@ func CreateProject(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}
 
-		userRequest.UserID = c.MustGet("uid").(string)
+		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
+		}
 
 		user, err := service.GetUser(userRequest.UserID)
 		if err != nil {
@@ -349,18 +370,22 @@ func CreateProject(service services.ApplicationService) gin.HandlerFunc {
 		// Adding user as project owner in project's member list
 		newMember := &entities.Member{
 			UserID:     user.ID,
+			Username:   user.Name,
+			Email:      user.Email,
 			Role:       entities.RoleOwner,
 			Invitation: entities.AcceptedInvitation,
 			JoinedAt:   time.Now().UnixMilli(),
 		}
 		var members []*entities.Member
 		members = append(members, newMember)
-		state := "active"
+		state := string(types.MemberStateActive)
 		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(),
@@ -436,7 +461,7 @@ func SendInvitation(service services.ApplicationService) gin.HandlerFunc {
 		}
 
 		// Validating member role
-		if member.Role == nil || (*member.Role != entities.RoleExecutor && *member.Role != entities.RoleViewer) {
+		if member.Role == nil || (*member.Role != entities.RoleExecutor && *member.Role != entities.RoleViewer && *member.Role != entities.RoleOwner) {
 			c.JSON(utils.ErrorStatusCodes[utils.ErrInvalidRole], presenter.CreateErrorResponse(utils.ErrInvalidRole))
 			return
 		}
@@ -734,6 +759,12 @@ func RemoveInvitation(service services.ApplicationService) gin.HandlerFunc {
 			return
 		}
 
+		uid := c.MustGet("uid").(string)
+		if uid == member.UserID {
+			c.JSON(http.StatusBadRequest, gin.H{"message": "User cannot remove invitation of themselves use Leave Project."})
+			return
+		}
+
 		invitation, err := getInvitation(service, member)
 		if err != nil {
 			log.Error(err)
 
@@ -34,10 +34,14 @@ 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 +64,30 @@ 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 +111,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 +149,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 +188,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)
 	})
 
@@ -97,9 +97,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) {
 
@@ -0,0 +1,17 @@
+package types
+
+type MemberState string
+
+const (
+	MemberStateActive   MemberState = "active"
+	MemberStateInactive MemberState = "inactive"
+)
+
+const (
+	ProjectName = "projectName"
+	SortField   = "sortField"
+	Ascending   = "sortAscending"
+	CreatedByMe = "createdByMe"
+	Page        = "page"
+	Limit       = "limit"
+)
Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,9 @@ func (m MockedApplicationService) GetProjects(query bson.D) ([]entities.Projec`
`97`	`97`	`return args.Get(0).([]*entities.Project), args.Error(1)`
`98`	`98`	`}`
`99`	`99`
`100`		`-func (m MockedApplicationService) GetProjectsByUserID(uid string, isOwner bool) ([]entities.Project, error) {`
`101`		`- args := m.Called(uid, isOwner)`
`102`		`- return args.Get(0).([]*entities.Project), args.Error(1)`
	`100`	`+func (m MockedApplicationService) GetProjectsByUserID(request entities.ListProjectRequest) (*entities.ListProjectResponse, error) {`
	`101`	`+ args := m.Called(request)`
	`102`	`+ return args.Get(0).(*entities.ListProjectResponse), args.Error(1)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func (m MockedApplicationService) GetProjectStats() ([]entities.ProjectStats, error) {`