sync in RPC for get accounts by count

AAStarCommunity · May 19, 2024 · 4c19ccc · 4c19ccc
1 parent 47d8583
commit 4c19ccc
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 12 deletions.
diff --git a/docs/docs.go b/docs/docs.go
@@ -80,8 +80,14 @@ const docTemplate = `{
                     }
                 ],
                 "responses": {
-                    "201": {
-                        "description": "Created"
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/storage.Member"
+                            }
+                        }
                     }
                 }
             }
@@ -158,6 +164,29 @@ const docTemplate = `{
                     "type": "string"
                 }
             }
+        },
+        "storage.Member": {
+            "type": "object",
+            "properties": {
+                "hashedAccount": {
+                    "type": "string"
+                },
+                "privateKeyVault": {
+                    "type": "string"
+                },
+                "publicKey": {
+                    "type": "string"
+                },
+                "rpcAddress": {
+                    "type": "string"
+                },
+                "rpcPort": {
+                    "type": "integer"
+                },
+                "version": {
+                    "type": "integer"
+                }
+            }
         }
     },
     "securityDefinitions": {

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -69,8 +69,14 @@
                     }
                 ],
                 "responses": {
-                    "201": {
-                        "description": "Created"
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/storage.Member"
+                            }
+                        }
                     }
                 }
             }
@@ -147,6 +153,29 @@
                     "type": "string"
                 }
             }
+        },
+        "storage.Member": {
+            "type": "object",
+            "properties": {
+                "hashedAccount": {
+                    "type": "string"
+                },
+                "privateKeyVault": {
+                    "type": "string"
+                },
+                "publicKey": {
+                    "type": "string"
+                },
+                "rpcAddress": {
+                    "type": "string"
+                },
+                "rpcPort": {
+                    "type": "integer"
+                },
+                "version": {
+                    "type": "integer"
+                }
+            }
         }
     },
     "securityDefinitions": {

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -11,6 +11,21 @@ definitions:
       apiKey:
         type: string
     type: object
+  storage.Member:
+    properties:
+      hashedAccount:
+        type: string
+      privateKeyVault:
+        type: string
+      publicKey:
+        type: string
+      rpcAddress:
+        type: string
+      rpcPort:
+        type: integer
+      version:
+        type: integer
+    type: object
 info:
   contact:
     name: AAStar Support
@@ -51,8 +66,12 @@ paths:
       produces:
       - application/json
       responses:
-        "201":
-          description: Created
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/storage.Member'
+            type: array
       security:
       - JWT: []
       tags:

diff --git a/internal/community/storage/member_itor.go b/internal/community/storage/member_itor.go
@@ -4,7 +4,7 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
-func GetAllMembers(skip uint32) []Member {
+func GetAllMembers(total uint32) []Member {
 	if ins, err := Open(); err != nil {
 		return nil
 	} else {
@@ -15,14 +15,15 @@ func GetAllMembers(skip uint32) []Member {
 		iter := db.NewIterator(&util.Range{
 			Start: []byte(MemberPrefix),
 		}, nil)
-		i := 1
+		i := 0
 		for iter.Next() {
-			if i >= int(skip) {
+			if i < int(total) {
 				if m, err := Unmarshal(iter.Value()); err != nil {
 					return nil
 				} else {
 					members = append(members, *m)
 				}
+				i++
 			}
 		}
 		iter.Release()

diff --git a/internal/web_server/controllers/account/v1/sync.go b/internal/web_server/controllers/account/v1/sync.go
@@ -1,6 +1,7 @@
 package account_v1
 
 import (
+	"another_node/internal/community/storage"
 	"another_node/internal/web_server/pkg"
 	"another_node/internal/web_server/pkg/response"
 
@@ -12,7 +13,7 @@ import (
 // @Description download accounts
 // @Accept json
 // @Produce json
-// @Success 201
+// @Success 200 {array} storage.Member
 // @Router /api/account/v1/sync [GET]
 // @Param        count    query     int  true  "how many accounts to download"
 // @Security JWT
@@ -21,8 +22,8 @@ func Sync(ctx *gin.Context) {
 		response.BadRequest(ctx, err)
 		return
 	} else {
-		_ = count
+		members := storage.GetAllMembers(uint32(count))
 		//community.SyncAccounts(count)
-		response.Created(ctx, nil)
+		response.Success(ctx, members)
 	}
 }
diff --git a/internal/web_server/routers/builder.go b/internal/web_server/routers/builder.go
@@ -27,5 +27,6 @@ func buildRouters(router *gin.Engine) {
 	{
 		account := router.Group("/api/account")
 		account.POST("/v1/bind", account_v1.Bind)
+		account.GET("/v1/sync", account_v1.Sync)
 	}
 }