fix(server): fix pagination for GetAllProjects to use limit and offset param [VIZ-2271] (#1845)

Author: wilfredmulenga

server/internal/adapter/internalapi/server.go

@@ -123,11 +123,33 @@ func (s server) GetAllProjects(ctx context.Context, req *pb.GetAllProjectsReques
 		}
 	}
 
-	pagination := internalapimodel.ToProjectPagination(req.Pagination)
+	maxLimit := int64(100)
+	if req.Pagination.Limit != nil && *req.Pagination.Limit > maxLimit {
+		req.Pagination.Limit = &maxLimit
+	}
 
 	// Parse the sort type from the request
 	sort := internalapimodel.ToProjectSortType(req.Sort)
 
+	var pagination *usecasex.Pagination
+	var param *interfaces.ProjectListParam
+	if req.Pagination != nil && req.Pagination.Offset != nil && req.Pagination.Limit != nil {
+		param = &interfaces.ProjectListParam{
+			Offset: req.Pagination.Offset,
+			Limit:  req.Pagination.Limit,
+		}
+		pagination = nil
+	} else {
+		pagination = internalapimodel.ToProjectPagination(req.Pagination)
+		if pagination == nil {
+			defaultLimit := int32(100)
+			req.Pagination = &pb.Pagination{
+				First: &defaultLimit,
+			}
+			pagination = internalapimodel.ToProjectPagination(req.Pagination)
+		}
+	}
+
 	// Convert SearchFieldType to string
 	var searchField *string
 	if req.SearchField != nil && *req.SearchField == pb.SearchFieldType_SEARCH_FIELD_TYPE_TOPICS {
@@ -146,7 +168,7 @@ func (s server) GetAllProjects(ctx context.Context, req *pb.GetAllProjectsReques
 		visibility = &v
 	}
 
-	res, info, err := uc.Project.FindAll(ctx, req.Keyword, sort, pagination, searchField, visibility)
+	res, info, err := uc.Project.FindAll(ctx, req.Keyword, sort, pagination, param, searchField, visibility)
 
 	if err != nil {
 		log.Errorf("GetAllProjects: Database query failed: %v", err)

server/internal/infrastructure/mongo/project.go

@@ -14,6 +14,7 @@ import (
 	"github.com/reearth/reearth/server/pkg/alias"
 	"github.com/reearth/reearth/server/pkg/id"
 	"github.com/reearth/reearth/server/pkg/project"
+	"github.com/reearth/reearth/server/pkg/visualizer"
 	"github.com/reearth/reearthx/account/accountdomain"
 	"github.com/reearth/reearthx/log"
 	"github.com/reearth/reearthx/mongox"
@@ -606,8 +607,61 @@ func (r *Project) FindAll(ctx context.Context, pFilter repo.ProjectFilter) ([]*p
 		}
 	}
 
+	if pFilter.Limit != nil && pFilter.Offset != nil {
+		totalCount, err := r.client.Count(ctx, filter)
+		if err != nil {
+			log.Errorf("FindAll: Count error: %v", err)
+			return nil, nil, visualizer.ErrorWithCallerLogging(ctx, "FindAll: Count error:", err)
+		}
+
+		var sortDoc bson.D
+		if pFilter.Sort != nil {
+			sortKey := pFilter.Sort.Key
+			if sortKey == "starcount" {
+				sortKey = "star_count" // Map to MongoDB field name
+			}
+			sortOrder := 1
+			if pFilter.Sort.Desc {
+				sortOrder = -1
+			}
+			sortDoc = bson.D{{Key: sortKey, Value: sortOrder}}
+		} else {
+			sortDoc = bson.D{{Key: "star_count", Value: -1}}
+		}
+
+		collation := options.Collation{
+			Locale:    "en",
+			Strength:  3,
+			CaseLevel: true,
+			Alternate: "shifted",
+		}
+
+		findOptions := options.Find().
+			SetCollation(&collation).
+			SetSkip(*pFilter.Offset).
+			SetLimit(*pFilter.Limit)
+
+		if len(sortDoc) > 0 {
+			findOptions.SetSort(sortDoc)
+		}
+
+		c := mongodoc.NewProjectConsumer(nil)
+		if err := r.client.Find(ctx, filter, c, findOptions); err != nil {
+			log.Errorf("FindAll: Find error: %v", err)
+			return nil, nil, visualizer.ErrorWithCallerLogging(ctx, "FindAll: Count error:", err)
+		}
+
+		pageInfo := &usecasex.PageInfo{
+			TotalCount:      totalCount,
+			HasNextPage:     *pFilter.Offset+*pFilter.Limit < totalCount,
+			HasPreviousPage: *pFilter.Offset > 0,
+		}
+
+		return c.Result, pageInfo, visualizer.ErrorWithCallerLogging(ctx, "FindAll: Count error:", err)
+	}
+
 	if pFilter.Pagination == nil {
-		log.Warnf("FindAll: Pagination is nil, not using pagination")
+		visualizer.WarnWithCallerLogging(ctx, "FindAll: No pagination provided, returning all results")
 	}
 
 	projects, pageInfo, err := r.paginateWithoutWorkspaceFilter(ctx, filter, pFilter.Sort, pFilter.Pagination)

server/internal/usecase/interactor/project.go

@@ -341,7 +341,7 @@ func (i *Project) FindVisibilityByWorkspace(
 	return result, pInfo, err
 }
 
-func (i *Project) FindAll(ctx context.Context, keyword *string, sort *project.SortType, pagination *usecasex.Pagination, searchField *string, visibility *string) ([]*project.Project, *usecasex.PageInfo, error) {
+func (i *Project) FindAll(ctx context.Context, keyword *string, sort *project.SortType, pagination *usecasex.Pagination, param *interfaces.ProjectListParam, searchField *string, visibility *string) ([]*project.Project, *usecasex.PageInfo, error) {
 	pFilter := repo.ProjectFilter{
 		Keyword:     keyword,
 		Sort:        sort,
@@ -350,6 +350,11 @@ func (i *Project) FindAll(ctx context.Context, keyword *string, sort *project.So
 		Visibility:  visibility,
 	}
 
+	if param != nil {
+		pFilter.Limit = param.Limit
+		pFilter.Offset = param.Offset
+	}
+
 	pList, pInfo, err := i.projectRepo.FindAll(ctx, pFilter)
 	if err != nil {
 		return nil, nil, err

server/internal/usecase/interfaces/project.go

@@ -105,7 +105,7 @@ type Project interface {
 
 	FindVisibilityByUser(context.Context, *user.User, bool, *usecase.Operator, *string, *project.SortType, *usecasex.Pagination, *ProjectListParam) ([]*project.Project, *usecasex.PageInfo, error)
 	FindVisibilityByWorkspace(context.Context, accountdomain.WorkspaceID, bool, *usecase.Operator, *string, *project.SortType, *usecasex.Pagination, *ProjectListParam) ([]*project.Project, *usecasex.PageInfo, error)
-	FindAll(context.Context, *string, *project.SortType, *usecasex.Pagination, *string, *string) ([]*project.Project, *usecasex.PageInfo, error)
+	FindAll(context.Context, *string, *project.SortType, *usecasex.Pagination, *ProjectListParam, *string, *string) ([]*project.Project, *usecasex.PageInfo, error)
 	UpdateVisibility(context.Context, id.ProjectID, string, *usecase.Operator) (*project.Project, error)
 
 	Create(context.Context, CreateProjectParam, *usecase.Operator) (*project.Project, error)