From 20ff541ab47b8f28d79d9efb3c21fbfcc48399ce Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 1 Dec 2024 11:32:54 +0800
Subject: [PATCH] :boom: Pagination fetching realm member api :bug: Fix remove
 realm member has no memberId path param

---
 .idea/workspace.xml                        |  8 +++++---
 pkg/internal/http/api/index.go             |  4 ++--
 pkg/internal/http/api/realm_members_api.go | 11 +++++++++--
 pkg/internal/services/realms.go            | 14 +++++++++++++-
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c70c25..6fdfaf1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,10 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":sparkles: Add realm member support both account name and id">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Prevent user adding a user twice into a realm">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/http/api/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/index.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/http/api/realm_members_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/realm_members_api.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pkg/internal/services/realms.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/realms.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -159,7 +161,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value=":sparkles: Authkit can get user" />
     <MESSAGE value=":bug: Fix auth cache" />
     <MESSAGE value=":sparkles: Allow get realm by numeric auto increment id" />
     <MESSAGE value=":sparkles: Allow access user info via numeric id" />
@@ -184,7 +185,8 @@
     <MESSAGE value=":boom: Move remove member api arguments from body to querystring just as messaging" />
     <MESSAGE value=":bug: Hotfix previous commit compile issue" />
     <MESSAGE value=":sparkles: Add realm member support both account name and id" />
-    <option name="LAST_COMMIT_MESSAGE" value=":sparkles: Add realm member support both account name and id" />
+    <MESSAGE value=":bug: Prevent user adding a user twice into a realm" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Prevent user adding a user twice into a realm" />
     <option name="GROUP_MULTIFILE_MERGE_BY_DIRECTORY" value="true" />
   </component>
   <component name="VgoProject">
diff --git a/pkg/internal/http/api/index.go b/pkg/internal/http/api/index.go
index 0e2a8be..84beadf 100644
--- a/pkg/internal/http/api/index.go
+++ b/pkg/internal/http/api/index.go
@@ -124,13 +124,13 @@ func MapAPIs(app *fiber.App, baseURL string) {
 			realms.Get("/me", listOwnedRealm)
 			realms.Get("/me/available", listAvailableRealm)
 			realms.Get("/:realm", getRealm)
-			realms.Get("/:realm/members/:memberId", listRealmMembers)
+			realms.Get("/:realm/members", listRealmMembers)
 			realms.Get("/:realm/members/me", getMyRealmMember)
 			realms.Post("/", createRealm)
 			realms.Put("/:realmId", editRealm)
 			realms.Delete("/:realmId", deleteRealm)
 			realms.Post("/:realm/members", addRealmMember)
-			realms.Delete("/:realm/members", removeRealmMember)
+			realms.Delete("/:realm/members/:memberId", removeRealmMember)
 			realms.Delete("/:realm/members/me", leaveRealm)
 		}
 
diff --git a/pkg/internal/http/api/realm_members_api.go b/pkg/internal/http/api/realm_members_api.go
index 787f6c9..50b7c71 100644
--- a/pkg/internal/http/api/realm_members_api.go
+++ b/pkg/internal/http/api/realm_members_api.go
@@ -11,13 +11,20 @@ import (
 
 func listRealmMembers(c *fiber.Ctx) error {
 	alias := c.Params("realm")
+	take := c.QueryInt("take", 0)
+	offset := c.QueryInt("offset", 0)
 
 	if realm, err := services.GetRealmWithAlias(alias); err != nil {
 		return fiber.NewError(fiber.StatusNotFound, err.Error())
-	} else if members, err := services.ListRealmMember(realm.ID); err != nil {
+	} else if count, err := services.CountRealmMember(realm.ID); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	} else if members, err := services.ListRealmMember(realm.ID, take, offset); err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	} else {
-		return c.JSON(members)
+		return c.JSON(fiber.Map{
+			"count": count,
+			"data":  members,
+		})
 	}
 }
 
diff --git a/pkg/internal/services/realms.go b/pkg/internal/services/realms.go
index 176927a..75117d2 100644
--- a/pkg/internal/services/realms.go
+++ b/pkg/internal/services/realms.go
@@ -74,10 +74,22 @@ func NewRealm(realm models.Realm, user models.Account) (models.Realm, error) {
 	return realm, err
 }
 
-func ListRealmMember(realmId uint) ([]models.RealmMember, error) {
+func CountRealmMember(realmId uint) (int64, error) {
+	var count int64
+	if err := database.C.Where(&models.RealmMember{
+		RealmID: realmId,
+	}).Model(&models.RealmMember{}).Count(&count).Error; err != nil {
+		return 0, err
+	} else {
+		return count, nil
+	}
+}
+
+func ListRealmMember(realmId uint, take int, offset int) ([]models.RealmMember, error) {
 	var members []models.RealmMember
 
 	if err := database.C.
+		Limit(take).Offset(offset).
 		Where(&models.RealmMember{RealmID: realmId}).
 		Preload("Account").
 		Find(&members).Error; err != nil {