企業協賛フィルター実装リリース

.gitignore

@@ -2,6 +2,7 @@
 /.idea/
 FinanSu.iml
 finansu.env
+finansu.local.env
 api/tmp
 
 # cloudflare

Makefile

@@ -1,21 +1,74 @@
+# アプリコンテナ=view,api、DBコンテナ=db,minio
+
+# アプリコンテナのイメージのビルド
 build:
 	docker compose build
 	docker compose run --rm view npm install
+
+# アプリコンテナの起動
 run:
 	docker compose up
-run-api:
-	docker compose up -d db
-	sleep 4
-	docker compose up api
+
+# アプリコンテナの停止
 down:
 	docker compose down
+
+# dbコンテナの起動(基本ずっと起動しておく)
+run-db:
+	docker compose -f docker-compose.db.yml up -d
+
+# dbコンテナの停止(ずっと起動したくない時はこっちで停止)
+stop-db:
+	docker compose -f docker-compose.db.yml down
+
+# ビルドと起動
+build-run:
+	docker compose -f docker-compose.db.yml up -d
+	docker compose up --build
+
+# アプリコンテナボリュームの削除
+del-vol:
+	docker compose down -v
+
+# 生成したコンテナ、イメージ、ボリューム、ネットワークを一括削除
+del-all:
+	docker-compose down --rmi all --volumes --remove-orphans
+
+# ボリューム削除→ビルド→起動
+run-rebuild:
+	docker compose down -v
+	docker compose up --build
+
+# dbとminioの停止とボリューム削除(dbを初期化したい時)
+del-db:
+	docker-compose -f docker-compose.db.yml down --volumes
+
+# apiの起動(db起動後)
+run-api:
+	docker compose up api
+
+# StoryBookの起動
+run-sb:
+	docker compose run --rm -p6006:6006 view npm run storybook
+
 seed:
 	docker compose run --rm api go mod tidy
 	docker compose run --rm api go run /app/tools/seeds/teacher_seeds.go
+
+# 本番環境デプロイ
 deploy:
 	docker compose -f docker-compose.prod.yml build
 	docker compose -f docker-compose.prod.yml up -d
-local-deploy:
+
+# ローカルで本番設定で起動
+run-prod:
 	docker compose -f docker-compose.local-prod.yml build
 	docker compose -f docker-compose.local-prod.yml up
 
+# DB入るコマンド
+ent-db:
+	docker compose exec db mysql -u root -proot
+
+# eslintの実行
+run-eslint:
+	docker compose exec view npm run lint

README.md

@@ -1,16 +1,19 @@
 # FinanSu
 
-## setting up
+## 環境構築 (set up)
 
 ```
-docker compose build
-docker compose up
+make run-db
+make build
+make run
 ```
 
 or
 
 ```
-make build
+docker compose -f docker-compose.db.yml up -d
+docker compose build
+docker compose up
 ```
 
 ## documents

api/dev.Dockerfile

@@ -22,5 +22,3 @@ RUN go install github.com/swaggo/swag/cmd/swag@latest
 # Airをインストール
 RUN go install github.com/air-verse/air@latest
 CMD ["air", "-c", ".air.toml"]
-
-

api/docs/docs.go

@@ -76,6 +76,107 @@ const docTemplate = `{
 						}
 				},
 		},
+        "/activities/filtered_details": {
+            "get": {
+                tags: ["activity"],
+                "description": "activitiesとsponsor,sponsorStyle,userの一覧を取得",
+                "parameters": [
+                    {
+                        "name": "is_done",
+                        "in": "query",
+                        "description": "Filter by done status.[true, false, all]",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "enum": ["true", "false", "all"]
+                        }
+                    },
+                    {
+                        "name": "sponsor_style_id",
+                        "in": "query",
+                        "description": "Filter by sponsor style IDs. ex.) 1,3,6,...",
+                        "required": false,
+                        "schema": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                        },
+                        "style": "form",
+                        "explode": true
+                    },
+                    {
+                        "name": "keyword",
+                        "in": "query",
+                        "description": "Filter by keyword",
+                        "required": false,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                ],
+                "responses": {
+                    "200": {
+                        "description": "activitiesとsponsor,sponsorStyle,userの一覧の取得",
+                    }
+                }
+            },
+        },
+        "/activities/filtered_details/{year}": {
+            "get": {
+                tags: ["activity"],
+                "description": "activitiesとsponsor,sponsorStyle,userの一覧を取得",
+                "parameters": [
+                    {
+                        "name": "year",
+                        "in": "path",
+                        "description": "Filter by year.",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "is_done",
+                        "in": "query",
+                        "description": "Filter by done status.[true, false, all]",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "enum": ["true", "false", "all"]
+                        }
+                    },
+                    {
+                        "name": "sponsor_style_id",
+                        "in": "query",
+                        "description": "Filter by sponsor style IDs. ex.) 1,3,6,...",
+                        "required": false,
+                        "schema": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                        },
+                        "style": "form",
+                        "explode": true
+                    },
+                    {
+                        "name": "keyword",
+                        "in": "query",
+                        "description": "Filter by keyword",
+                        "required": false,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                ],
+                "responses": {
+                    "200": {
+                        "description": "activitiesとsponsor,sponsorStyle,userの一覧の取得",
+                    }
+                }
+            },
+        },
         "/activities/{id}": {
             "get": {
                 tags: ["activity"],
@@ -2006,6 +2107,26 @@ const docTemplate = `{
                 ],
             },
         },
+				"/teachers/delete": {
+					"delete": {
+							tags: ["teacher"],
+							"description": "teacherの複数削除",
+							responses: {
+									"200": {
+											"description": "複数のteacherをidで削除できる",
+									}
+							},
+							"parameters": [
+									{
+											"in": "body",
+											"name": "destroyTeacherIDs",
+											"schema":{
+													"$ref": "#/definitions/destroyTeacherIDs"
+											},
+									},
+							],
+					},
+			},
         "/teachers/{id}": {
             "get": {
                 tags: ["teacher"],
@@ -2100,6 +2221,26 @@ const docTemplate = `{
                 },
             },
         },
+				"/teachers/fundRegistered/{year}": {
+            "get": {
+                tags: ["teacher"],
+                "description": "募金登録済みのteacherのidを取得",
+                "parameters": [
+                    {
+                        "name": "year",
+                        "in": "path",
+                        "description": "year",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "募金登録済みのteacherのidを取得",
+                    }
+                }
+            },
+				},
         "/users": {
             "get": {
                 tags: ["user"],
@@ -2428,7 +2569,6 @@ const docTemplate = `{
                 "feature":{
                     "type": "string",
                     "example": "なし",
-
                 },
                 "expense":{
                     "type": "int",
@@ -2618,20 +2758,34 @@ const docTemplate = `{
                     "purchaseOrderID"
             },
         },
-        "destroyUserIDs":{
-            "properties":{
-                "deleteIDs":{
-                    "type": "array",
-                    "items": {
-                        "type": "number"
-                    },
-                    example: []
-                },
-            },
-            "required":{
-                    "deleteIDs",
-            },
-        },
+				"destroyTeacherIDs":{
+					"properties":{
+							"deleteIDs":{
+									"type": "array",
+									"items": {
+											"type": "number"
+									},
+									example: []
+							},
+					},
+					"required":{
+									"deleteIDs",
+					},
+				},
+				"destroyUserIDs":{
+					"properties":{
+							"deleteIDs":{
+									"type": "array",
+									"items": {
+											"type": "number"
+									},
+									example: []
+							},
+					},
+					"required":{
+									"deleteIDs",
+					},
+				},
         "year_periods":{
             "properties":{
                 "year":{

api/externals/controller/activity_controller.go

@@ -22,6 +22,8 @@ type ActivityController interface {
 	DestroyActivity(echo.Context) error
 	IndexActivityDetail(echo.Context) error
 	IndexActivityDetailsByPeriod(echo.Context) error
+	IndexFilteredActivityDetail(echo.Context) error
+	IndexFilteredActivityDetailByPeriod(echo.Context) error
 }
 
 func NewActivityController(u usecase.ActivityUseCase) ActivityController {
@@ -104,3 +106,26 @@ func (a *activityController) IndexActivityDetailsByPeriod(c echo.Context) error
 	}
 	return c.JSON(http.StatusOK, activities)
 }
+
+func (a *activityController) IndexFilteredActivityDetail(c echo.Context) error {
+	isDone := c.QueryParam("is_done")
+	sponsorStyleIDs := c.QueryParams()["sponsor_style_id"]
+	keyword := c.QueryParam("keyword")
+	activities, err := a.u.GetFilteredActivityDetail(c.Request().Context(), isDone, sponsorStyleIDs, keyword)
+	if err != nil {
+		return err
+	}
+	return c.JSON(http.StatusOK, activities)
+}
+
+func (a *activityController) IndexFilteredActivityDetailByPeriod(c echo.Context) error {
+	isDone := c.QueryParam("is_done")
+	sponsorStyleIDs := c.QueryParams()["sponsor_style_id"]
+	year := c.Param("year")
+	keyword := c.QueryParam("keyword")
+	activities, err := a.u.GetFilteredActivityDetailByPeriod(c.Request().Context(), isDone, sponsorStyleIDs, year, keyword)
+	if err != nil {
+		return err
+	}
+	return c.JSON(http.StatusOK, activities)
+}