Merge pull request #198 from SIT-DigiCre/feature/budget-sort-and-pagination

稟議一覧の取得の機能拡充

Author: saka-naname

document/bundle-develop.gen.yml

@@ -1151,6 +1151,10 @@ paths:
           in: query
           schema:
             type: integer
+        - name: proposerId
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Success budget list

document/bundle.gen.yml

@@ -1143,6 +1143,10 @@ paths:
           in: query
           schema:
             type: integer
+        - name: proposerId
+          in: query
+          schema:
+            type: string
       responses:
         '200':
           description: Success budget list

document/paths/budget.yml

@@ -9,6 +9,10 @@ get:
       in: query
       schema:
         type: integer
+    - name: proposerId
+      in: query
+      schema:
+        type: string
   responses:
     200:
       description: "Success budget list"

pkg/api/models.gen.go

@@ -12,7 +12,7 @@ import (
 
 func GetBudget(ctx echo.Context, dbClient db.Client, params api.GetBudgetParams) (api.ResGetBudget, *response.Error) {
 	res := api.ResGetBudget{}
-	budget, err := getBudgetList(dbClient, params.Offset)
+	budget, err := getBudgetList(dbClient, params.Offset, params.ProposerId)
 	if err != nil {
 		return api.ResGetBudget{}, err
 	}
@@ -43,11 +43,13 @@ type budgetObjectProposer struct {
 	IconUrl  string
 }
 
-func getBudgetList(dbClient db.Client, offset *int) ([]budget, *response.Error) {
+func getBudgetList(dbClient db.Client, offset *int, proposerId *string) ([]budget, *response.Error) {
 	params := struct {
-		Offset *int `twowaysql:"offset"`
+		Offset     *int    `twowaysql:"offset"`
+		ProposerId *string `twowaysql:"proposerId"`
 	}{
-		Offset: offset,
+		Offset:     offset,
+		ProposerId: proposerId,
 	}
 	budget := []budget{}
 	err := dbClient.Select(&budget, "sql/budget/select_budget.sql", &params)

pkg/api/server.gen.go

@@ -1 +1 @@
-SELECT BIN_TO_UUID(`budgets`.id) as budget_id, BIN_TO_UUID(proposer_user_id) as user_id, username as user_name, icon_url, `status`, class, name, budget, settlement, `budgets`.updated_at as updated_at FROM `budgets` LEFT JOIN `user_profiles` ON `budgets`.proposer_user_id = `user_profiles`.user_id;
+SELECT BIN_TO_UUID(`budgets`.id) as budget_id, BIN_TO_UUID(proposer_user_id) as user_id, username as user_name, icon_url, `status`, class, name, budget, settlement, `budgets`.updated_at as updated_at FROM `budgets` LEFT JOIN `user_profiles` ON `budgets`.proposer_user_id = `user_profiles`.user_id /* IF proposerId */ WHERE UUID_TO_BIN(/*proposerId*/'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee') = proposer_user_id /* END */ ORDER BY `budgets`.updated_at DESC LIMIT 10 /* IF offset */ OFFSET /*offset*/0 /* END */;