web: provide access project and datasets to all org members

shreeharsha-factly · shreeharsha-factly · commit bda820b78d68 · 2026-02-27T16:14:22.000+05:30
diff --git a/server/application/repositories/store.go b/server/application/repositories/store.go
@@ -77,7 +77,7 @@ type DatasetStoreRepository interface {
 	SearchDatasetsByOrgAndCreator(ctx context.Context, query string, pagination models.Pagination, orgID, createdBy string) (*models.PaginationView[*models.Dataset], error)
 	DeleteByOrgAndCreator(ctx context.Context, datasetID, orgID, createdBy string) error
 	UpdateByOrgAndCreator(ctx context.Context, datasetID, orgID, createdBy string, params *models.UpdateDatasetParams) (*models.Dataset, error)
-	ListByProjectAndRole(ctx context.Context, projectID, orgID, createdBy string, role models.Role, pagination models.Pagination) (*models.PaginationView[*models.Dataset], error)
+	ListByProjectAndOrg(ctx context.Context, projectID, orgID, createdBy string, pagination models.Pagination) (*models.PaginationView[*models.Dataset], error)
 }
 
 type ChatStoreRepository interface {
diff --git a/server/application/services/store.go b/server/application/services/store.go
@@ -25,11 +25,8 @@ func (service *ProjectService) Create(params models.CreateProjectParams) (*model
 }
 
 // Details - Get project by id
-func (service *ProjectService) Details(id, orgID, createdBy string, role models.Role) (*models.Project, error) {
-	if role == models.Admin {
-		return service.projectRepo.Details(context.Background(), id, orgID)
-	}
-	return service.projectRepo.DetailsByOrgAndCreator(context.Background(), id, orgID, createdBy)
+func (service *ProjectService) Details(id, orgID, createdBy string) (*models.Project, error) {
+	return service.projectRepo.Details(context.Background(), id, orgID)
 }
 
 func (service *ProjectService) GetProjectByID(id string) (*models.Project, error) {
@@ -61,17 +58,14 @@ func (service *ProjectService) DatasetsBelongToOrg(datasetNames []string, orgID
 }
 
 // List - Search projects
-func (service *ProjectService) List(query string, limit, page int, orgID, createdBy string, role models.Role) (*models.PaginationView[*models.SearchProjectsResults], error) {
+func (service *ProjectService) List(query string, limit, page int, orgID, createdBy string) (*models.PaginationView[*models.SearchProjectsResults], error) {
 	pagination := models.NewPagination()
 	if limit != 0 {
 		pagination.Limit = limit
 	}
 	pagination.Offset = (page - 1) * limit
 
-	if role == models.Admin {
-		return service.projectRepo.SearchProject(context.Background(), query, pagination, orgID)
-	}
-	return service.projectRepo.SearchProjectByOrgAndCreator(context.Background(), query, pagination, orgID, createdBy)
+	return service.projectRepo.SearchProject(context.Background(), query, pagination, orgID)
 }
 
 func (service *ProjectService) ListAllProjects() ([]*models.Project, error) {
@@ -96,11 +90,8 @@ func (service *DatasetService) Create(params *models.CreateDatasetParams) (*mode
 	return service.datasetRepo.Create(context.Background(), params)
 }
 
-func (service *DatasetService) Details(id, orgID, createdBy string, role models.Role) (*models.Dataset, error) {
-	if role == models.Admin {
-		return service.datasetRepo.Details(context.Background(), id, orgID)
-	}
-	return service.datasetRepo.DetailsByOrgAndCreator(context.Background(), id, orgID, createdBy)
+func (service *DatasetService) Details(id, orgID, createdBy string) (*models.Dataset, error) {
+	return service.datasetRepo.Details(context.Background(), id, orgID)
 }
 
 func (service *DatasetService) GetByTableName(tableName string, orgID string) (*models.Dataset, error) {
@@ -113,7 +104,7 @@ func (service *DatasetService) List(projectID string, role models.Role, orgID, c
 		pagination.Limit = limit
 	}
 	pagination.Offset = (page - 1) * limit
-	return service.datasetRepo.ListByProjectAndRole(context.Background(), projectID, orgID, createdBy, role, pagination)
+	return service.datasetRepo.ListByProjectAndOrg(context.Background(), projectID, orgID, createdBy, pagination)
 }
 
 func (service *DatasetService) Delete(id, orgID, createdBy string, role models.Role) error {
diff --git a/server/infrastructure/postgres/store/datasets/list_by_project_and_org.go b/server/infrastructure/postgres/store/datasets/list_by_project_and_org.go
@@ -0,0 +1,11 @@
+package datasets
+
+import (
+	"context"
+
+	"github.com/factly/gopie/domain/models"
+)
+
+func (s *PgDatasetStore) ListByProjectAndOrg(ctx context.Context, projectID, orgID, createdBy string, pagination models.Pagination) (*models.PaginationView[*models.Dataset], error) {
+	return s.List(ctx, projectID, pagination)
+}
diff --git a/server/infrastructure/postgres/store/datasets/list_by_project_and_role.go b/server/infrastructure/postgres/store/datasets/list_by_project_and_role.go
diff --git a/server/interfaces/http/middleware/validate.go b/server/interfaces/http/middleware/validate.go
@@ -3,7 +3,6 @@ package middleware
 import (
 	"github.com/factly/gopie/application/services"
 	"github.com/factly/gopie/domain"
-	"github.com/factly/gopie/domain/models"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -16,7 +15,6 @@ func ValidateProjectMiddleware(projectSvc *services.ProjectService) fiber.Handle
 		projectID := c.Params("projectID")
 		orgID, _ := c.Locals(OrganizationCtxKey).(string)
 		userID, _ := c.Locals(UserCtxKey).(string)
-		role := c.Locals(RoleCtxKey).(models.Role)
 		if projectID == "" {
 			return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
 				"error":   "Invalid request",
@@ -34,7 +32,7 @@ func ValidateProjectMiddleware(projectSvc *services.ProjectService) fiber.Handle
 			})
 		}
 
-		_, err := projectSvc.Details(projectID, orgID, userID, role)
+		_, err := projectSvc.Details(projectID, orgID, userID)
 		if err != nil {
 			if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
 				return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
diff --git a/server/interfaces/http/routes/api/datasets/details.go b/server/interfaces/http/routes/api/datasets/details.go
@@ -2,7 +2,6 @@ package datasets
 
 import (
 	"github.com/factly/gopie/domain"
-	"github.com/factly/gopie/domain/models"
 	"github.com/factly/gopie/interfaces/http/middleware"
 	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
@@ -22,8 +21,7 @@ func (h *httpHandler) details(ctx *fiber.Ctx) error {
 	datasetID := ctx.Params("datasetID")
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
-	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID, role)
+	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID)
 	if err != nil {
 		h.logger.Error("Error fetching dataset details", zap.Error(err), zap.String("datasetID", datasetID))
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
diff --git a/server/interfaces/http/routes/api/datasets/get-column-descriptions.go b/server/interfaces/http/routes/api/datasets/get-column-descriptions.go
@@ -23,10 +23,9 @@ func (h *httpHandler) getColumnDescriptions(ctx *fiber.Ctx) error {
 	datasetID := ctx.Params("datasetID")
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
 
 	// Get the dataset details to verify it exists and get the dataset name
-	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID, role)
+	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID)
 	if err != nil {
 		h.logger.Error("Error fetching dataset", zap.Error(err), zap.String("datasetID", datasetID))
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
diff --git a/server/interfaces/http/routes/api/datasets/update-column-descriptions.go b/server/interfaces/http/routes/api/datasets/update-column-descriptions.go
@@ -30,7 +30,6 @@ func (h *httpHandler) updateColumnDescriptions(ctx *fiber.Ctx) error {
 	datasetID := ctx.Params("datasetID")
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
 
 	var body updateColumnDescriptionsParams
 	if err := ctx.BodyParser(&body); err != nil {
@@ -52,7 +51,7 @@ func (h *httpHandler) updateColumnDescriptions(ctx *fiber.Ctx) error {
 	}
 
 	// Get the dataset details to verify it exists and get the dataset name
-	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID, role)
+	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID)
 	if err != nil {
 		h.logger.Error("Error fetching dataset", zap.Error(err), zap.String("datasetID", datasetID))
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
diff --git a/server/interfaces/http/routes/api/projects/datasets/delete.go b/server/interfaces/http/routes/api/projects/datasets/delete.go
@@ -30,7 +30,7 @@ func (h *httpHandler) delete(ctx *fiber.Ctx) error {
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
 	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
-	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID, role)
+	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID)
 	if err != nil {
 		h.logger.Error("Error deleting dataset", zap.Error(err), zap.String("datasetID", datasetID))
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
diff --git a/server/interfaces/http/routes/api/projects/datasets/details.go b/server/interfaces/http/routes/api/projects/datasets/details.go
@@ -2,7 +2,6 @@ package datasets
 
 import (
 	"github.com/factly/gopie/domain"
-	"github.com/factly/gopie/domain/models"
 	"github.com/factly/gopie/interfaces/http/middleware"
 	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
@@ -23,8 +22,7 @@ func (h *httpHandler) details(ctx *fiber.Ctx) error {
 	datasetID := ctx.Params("datasetID")
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
-	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID, role)
+	dataset, err := h.datasetsSvc.Details(datasetID, orgID, userID)
 	if err != nil {
 		h.logger.Error("Error fetching dataset details", zap.Error(err), zap.String("datasetID", datasetID))
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
diff --git a/server/interfaces/http/routes/api/projects/datasets/update.go b/server/interfaces/http/routes/api/projects/datasets/update.go
@@ -53,7 +53,7 @@ func (h *httpHandler) update(ctx *fiber.Ctx) error {
 			"code":    fiber.StatusBadRequest,
 		})
 	}
-	existingDataset, err := h.datasetsSvc.Details(datasetID, orgID, userID, role)
+	existingDataset, err := h.datasetsSvc.Details(datasetID, orgID, userID)
 	if err != nil {
 		h.logger.Error("Error updating dataset", zap.Error(err), zap.String("datasetID", datasetID))
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
diff --git a/server/interfaces/http/routes/api/projects/details.go b/server/interfaces/http/routes/api/projects/details.go
@@ -2,7 +2,6 @@ package projects
 
 import (
 	"github.com/factly/gopie/domain"
-	"github.com/factly/gopie/domain/models"
 	"github.com/factly/gopie/interfaces/http/middleware"
 	"github.com/gofiber/fiber/v2"
 )
@@ -21,9 +20,8 @@ func (h *httpHandler) details(ctx *fiber.Ctx) error {
 	projectID := ctx.Params("projectID")
 	orgID := ctx.Get(middleware.OrganizationIDHeader)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
 
-	project, err := h.projectSvc.Details(projectID, orgID, userID, role)
+	project, err := h.projectSvc.Details(projectID, orgID, userID)
 	if err != nil {
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
 			return ctx.Status(fiber.StatusNotFound).JSON(fiber.Map{
diff --git a/server/interfaces/http/routes/api/projects/list.go b/server/interfaces/http/routes/api/projects/list.go
@@ -2,7 +2,6 @@ package projects
 
 import (
 	"github.com/factly/gopie/domain"
-	"github.com/factly/gopie/domain/models"
 	"github.com/factly/gopie/domain/pkg"
 	"github.com/factly/gopie/interfaces/http/middleware"
 	"github.com/gofiber/fiber/v2"
@@ -24,14 +23,13 @@ import (
 func (h *httpHandler) list(ctx *fiber.Ctx) error {
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
 	limitStr := ctx.Query("limit")
 	pageStr := ctx.Query("page")
 	query := ctx.Query("query")
 
 	limit, page := pkg.ParseLimitAndPage(limitStr, pageStr)
 
-	projects, err := h.projectSvc.List(query, limit, page, orgID, userID, role)
+	projects, err := h.projectSvc.List(query, limit, page, orgID, userID)
 	if err != nil {
 		if domain.IsStoreError(err) {
 			switch err {
diff --git a/server/interfaces/http/routes/source/database/create.go b/server/interfaces/http/routes/source/database/create.go
@@ -122,7 +122,7 @@ func (h *httpHandler) create(ctx *fiber.Ctx) error {
 	}
 
 	// Check if project exists
-	project, err := h.projectSvc.Details(body.ProjectID, orgID, userID, role)
+	project, err := h.projectSvc.Details(body.ProjectID, orgID, userID)
 	if err != nil {
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
 			h.logger.Error("Project not found", zap.Error(err), zap.String("project_id", body.ProjectID))
diff --git a/server/interfaces/http/routes/source/database/refresh.go b/server/interfaces/http/routes/source/database/refresh.go
@@ -56,7 +56,7 @@ func (h *httpHandler) refresh(ctx *fiber.Ctx) error {
 	}
 
 	// Check if project exists
-	project, err := h.projectSvc.Details(body.ProjectID, orgID, userID, role)
+	project, err := h.projectSvc.Details(body.ProjectID, orgID, userID)
 	if err != nil {
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
 			h.logger.Error("Project not found", zap.Error(err), zap.String("project_id", body.ProjectID))
diff --git a/server/interfaces/http/routes/source/s3/create.go b/server/interfaces/http/routes/source/s3/create.go
@@ -86,7 +86,6 @@ func (h *httpHandler) cleanupResources(rc resourceCleanup) {
 func (h *httpHandler) upload(ctx *fiber.Ctx) error {
 	orgID := ctx.Locals(middleware.OrganizationCtxKey).(string)
 	userID := ctx.Locals(middleware.UserCtxKey).(string)
-	role := ctx.Locals(middleware.RoleCtxKey).(models.Role)
 	if orgID == "" {
 		h.logger.Error("Organization ID header is missing")
 		return ctx.Status(fiber.StatusForbidden).JSON(fiber.Map{
@@ -118,7 +117,7 @@ func (h *httpHandler) upload(ctx *fiber.Ctx) error {
 	}
 
 	// Check if project exists
-	project, err := h.projectSvc.Details(body.ProjectID, orgID, userID, role)
+	project, err := h.projectSvc.Details(body.ProjectID, orgID, userID)
 	if err != nil {
 		if domain.IsStoreError(err) && err == domain.ErrRecordNotFound {
 			h.logger.Error("Project not found", zap.Error(err), zap.String("project_id", body.ProjectID))
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
@@ -23,12 +23,15 @@ import { AlertCircle } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { ThemeToggle } from "@/components/theme/toggle";
 import { ContextSelectionHelper } from "@/components/chat/context-selection-helper";
+import { useAuthStore } from "@/lib/stores/auth-store";
 // import { UserInfo } from "@/components/dashboard/user-info";
 
 export default function HomePage() {
   const { toast } = useToast();
   const queryClient = useQueryClient();
   const router = useRouter();
+  const { role, user } = useAuthStore();
+  const isAdmin = role === "admin";
   const {
     data: projects,
     isLoading,
@@ -360,8 +363,8 @@ export default function HomePage() {
                   >
                     <ProjectCard
                       project={project}
-                      onUpdate={handleUpdateProject}
-                      onDelete={handleDeleteProject}
+                      onUpdate={isAdmin || project.created_by === user?.id ? handleUpdateProject : undefined}
+                      onDelete={isAdmin || project.created_by === user?.id ? handleDeleteProject : undefined}
                     />
                   </motion.div>
                 ))
diff --git a/web/src/app/projects/[projectId]/datasets/[datasetId]/page.tsx b/web/src/app/projects/[projectId]/datasets/[datasetId]/page.tsx
@@ -9,6 +9,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { DatasetHeader } from "@/components/dataset/dataset-header";
 import { useQueryClient } from "@tanstack/react-query";
 import { useDataset } from "@/lib/queries/dataset/get-dataset";
+import { useAuthStore } from "@/lib/stores/auth-store";
 import { useSidebar } from "@/components/ui/sidebar";
 
 export default function DatasetPage({
@@ -18,6 +19,7 @@ export default function DatasetPage({
 }) {
   const { datasetId, projectId } = React.use(params);
   const queryClient = useQueryClient();
+  const { role, user } = useAuthStore();
   const { setOpen } = useSidebar();
 
   const { data: dataset, isLoading } = useDataset({
@@ -123,6 +125,7 @@ export default function DatasetPage({
             dataset={dataset}
             projectId={projectId}
             onUpdate={handleUpdate}
+            canEdit={role === "admin" || dataset.created_by === user?.id}
           />
         </motion.div>
 
diff --git a/web/src/app/projects/[projectId]/page.tsx b/web/src/app/projects/[projectId]/page.tsx
diff --git a/web/src/app/projects/[projectId]/upload/page.tsx b/web/src/app/projects/[projectId]/upload/page.tsx
diff --git a/web/src/components/dataset/column-descriptions-modal.tsx b/web/src/components/dataset/column-descriptions-modal.tsx
diff --git a/web/src/components/dataset/dataset-header.tsx b/web/src/components/dataset/dataset-header.tsx
diff --git a/web/src/components/project/inline-project-editor.tsx b/web/src/components/project/inline-project-editor.tsx
diff --git a/web/src/components/project/project-card.tsx b/web/src/components/project/project-card.tsx
diff --git a/web/src/lib/stores/auth-store.ts b/web/src/lib/stores/auth-store.ts

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ type DatasetStoreRepository interface {`
`77`	`77`	`SearchDatasetsByOrgAndCreator(ctx context.Context, query string, pagination models.Pagination, orgID, createdBy string) (models.PaginationView[models.Dataset], error)`
`78`	`78`	`DeleteByOrgAndCreator(ctx context.Context, datasetID, orgID, createdBy string) error`
`79`	`79`	`UpdateByOrgAndCreator(ctx context.Context, datasetID, orgID, createdBy string, params models.UpdateDatasetParams) (models.Dataset, error)`
`80`		`- ListByProjectAndRole(ctx context.Context, projectID, orgID, createdBy string, role models.Role, pagination models.Pagination) (models.PaginationView[models.Dataset], error)`
	`80`	`+ ListByProjectAndOrg(ctx context.Context, projectID, orgID, createdBy string, pagination models.Pagination) (models.PaginationView[models.Dataset], error)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`type ChatStoreRepository interface {`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,8 @@ func (service ProjectService) Create(params models.CreateProjectParams) (model`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// Details - Get project by id`
`28`		`-func (service ProjectService) Details(id, orgID, createdBy string, role models.Role) (models.Project, error) {`
`29`		`- if role == models.Admin {`
`30`		`- return service.projectRepo.Details(context.Background(), id, orgID)`
`31`		`- }`
`32`		`- return service.projectRepo.DetailsByOrgAndCreator(context.Background(), id, orgID, createdBy)`
	`28`	`+func (service ProjectService) Details(id, orgID, createdBy string) (models.Project, error) {`
	`29`	`+ return service.projectRepo.Details(context.Background(), id, orgID)`
`33`	`30`	`}`
`34`	`31`
`35`	`32`	`func (service ProjectService) GetProjectByID(id string) (models.Project, error) {`
`@@ -61,17 +58,14 @@ func (service *ProjectService) DatasetsBelongToOrg(datasetNames []string, orgID`
`61`	`58`	`}`
`62`	`59`
`63`	`60`	`// List - Search projects`
`64`		`-func (service ProjectService) List(query string, limit, page int, orgID, createdBy string, role models.Role) (models.PaginationView[*models.SearchProjectsResults], error) {`
	`61`	`+func (service ProjectService) List(query string, limit, page int, orgID, createdBy string) (models.PaginationView[*models.SearchProjectsResults], error) {`
`65`	`62`	`pagination := models.NewPagination()`
`66`	`63`	`if limit != 0 {`
`67`	`64`	`pagination.Limit = limit`
`68`	`65`	`}`
`69`	`66`	`pagination.Offset = (page - 1) * limit`
`70`	`67`
`71`		`- if role == models.Admin {`
`72`		`- return service.projectRepo.SearchProject(context.Background(), query, pagination, orgID)`
`73`		`- }`
`74`		`- return service.projectRepo.SearchProjectByOrgAndCreator(context.Background(), query, pagination, orgID, createdBy)`
	`68`	`+ return service.projectRepo.SearchProject(context.Background(), query, pagination, orgID)`
`75`	`69`	`}`
`76`	`70`
`77`	`71`	`func (service ProjectService) ListAllProjects() ([]models.Project, error) {`
`@@ -96,11 +90,8 @@ func (service DatasetService) Create(params models.CreateDatasetParams) (*mode`
`96`	`90`	`return service.datasetRepo.Create(context.Background(), params)`
`97`	`91`	`}`
`98`	`92`
`99`		`-func (service DatasetService) Details(id, orgID, createdBy string, role models.Role) (models.Dataset, error) {`
`100`		`- if role == models.Admin {`
`101`		`- return service.datasetRepo.Details(context.Background(), id, orgID)`
`102`		`- }`
`103`		`- return service.datasetRepo.DetailsByOrgAndCreator(context.Background(), id, orgID, createdBy)`
	`93`	`+func (service DatasetService) Details(id, orgID, createdBy string) (models.Dataset, error) {`
	`94`	`+ return service.datasetRepo.Details(context.Background(), id, orgID)`
`104`	`95`	`}`
`105`	`96`
`106`	`97`	`func (service DatasetService) GetByTableName(tableName string, orgID string) (models.Dataset, error) {`
`@@ -113,7 +104,7 @@ func (service *DatasetService) List(projectID string, role models.Role, orgID, c`
`113`	`104`	`pagination.Limit = limit`
`114`	`105`	`}`
`115`	`106`	`pagination.Offset = (page - 1) * limit`
`116`		`- return service.datasetRepo.ListByProjectAndRole(context.Background(), projectID, orgID, createdBy, role, pagination)`
	`107`	`+ return service.datasetRepo.ListByProjectAndOrg(context.Background(), projectID, orgID, createdBy, pagination)`
`117`	`108`	`}`
`118`	`109`
`119`	`110`	`func (service *DatasetService) Delete(id, orgID, createdBy string, role models.Role) error {`