From 973ea12af2ff3f77620e420abd30e7b5a1530e7b Mon Sep 17 00:00:00 2001 From: wakai111 <25.y.wakai.nutfes@gmail.com> Date: Fri, 12 Jun 2026 01:36:29 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E5=8D=94=E8=B3=9B=E6=B4=BB=E5=8B=95?= =?UTF-8?q?=E3=81=AE=E7=B5=9E=E3=82=8A=E8=BE=BC=E3=81=BF=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=AE=E3=83=90=E3=83=83=E3=82=AF=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/sponsorship_activity_repository.go | 3 +++ api/generated/openapi_gen.go | 10 ++++++++++ openapi/openapi.yaml | 8 +++++++- .../generated/model/getSponsorshipActivitiesParams.ts | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/api/externals/repository/sponsorship_activity_repository.go b/api/externals/repository/sponsorship_activity_repository.go index 0f753b3ab..d8c83d3a3 100644 --- a/api/externals/repository/sponsorship_activity_repository.go +++ b/api/externals/repository/sponsorship_activity_repository.go @@ -63,6 +63,9 @@ func (r *sponsorshipActivityRepository) FindAll(ctx context.Context, sponsorship if sponsorshipActivitiesSearchParams.ActivityStatus != nil { queryDataset = queryDataset.Where(goqu.I("sponsorship_activities.activity_status").Eq(string(*sponsorshipActivitiesSearchParams.ActivityStatus))) } + if sponsorshipActivitiesSearchParams.DesignProgress != nil { + queryDataset = queryDataset.Where(goqu.I("sponsorship_activities.design_progress").Eq(string(*sponsorshipActivitiesSearchParams.DesignProgress))) + } if sponsorshipActivitiesSearchParams.FeasibilityStatus != nil { queryDataset = queryDataset.Where(goqu.I("sponsorship_activities.feasibility_status").Eq(string(*sponsorshipActivitiesSearchParams.FeasibilityStatus))) } diff --git a/api/generated/openapi_gen.go b/api/generated/openapi_gen.go index 424ee8893..db56b21d1 100644 --- a/api/generated/openapi_gen.go +++ b/api/generated/openapi_gen.go @@ -851,6 +851,9 @@ type GetSponsorshipActivitiesParams struct { // ActivityStatus 活動ステータス (ActivityStatusの値を指定) ActivityStatus *ActivityStatus `form:"activity_status,omitempty" json:"activity_status,omitempty"` + // DesignProgress デザイン進捗ステータス (DesignProgressの値を指定) + DesignProgress *DesignProgress `form:"design_progress,omitempty" json:"design_progress,omitempty"` + // FeasibilityStatus 協賛可否ステータス (FeasibilityStatusの値を指定) FeasibilityStatus *FeasibilityStatus `form:"feasibility_status,omitempty" json:"feasibility_status,omitempty"` @@ -2958,6 +2961,13 @@ func (w *ServerInterfaceWrapper) GetSponsorshipActivities(ctx echo.Context) erro return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter activity_status: %s", err)) } + // ------------- Optional query parameter "design_progress" ------------- + + err = runtime.BindQueryParameter("form", true, false, "design_progress", ctx.QueryParams(), ¶ms.DesignProgress) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter design_progress: %s", err)) + } + // ------------- Optional query parameter "feasibility_status" ------------- err = runtime.BindQueryParameter("form", true, false, "feasibility_status", ctx.QueryParams(), ¶ms.FeasibilityStatus) diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index c6d3b18dd..3a383dd34 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -2543,6 +2543,12 @@ paths: required: false schema: $ref: "#/components/schemas/ActivityStatus" + - name: design_progress + in: query + description: デザイン進捗ステータス (DesignProgressの値を指定) + required: false + schema: + $ref: "#/components/schemas/DesignProgress" - name: feasibility_status in: query description: 協賛可否ステータス (FeasibilityStatusの値を指定) @@ -3794,4 +3800,4 @@ components: - money - goods -x-original-swagger-version: "2.0" \ No newline at end of file +x-original-swagger-version: "2.0" diff --git a/view/next-project/src/generated/model/getSponsorshipActivitiesParams.ts b/view/next-project/src/generated/model/getSponsorshipActivitiesParams.ts index 0bce46b0c..a6d109c6c 100644 --- a/view/next-project/src/generated/model/getSponsorshipActivitiesParams.ts +++ b/view/next-project/src/generated/model/getSponsorshipActivitiesParams.ts @@ -6,6 +6,7 @@ * OpenAPI spec version: 2.0.0 */ import type { ActivityStatus } from './activityStatus'; +import type { DesignProgress } from './designProgress'; import type { FeasibilityStatus } from './feasibilityStatus'; import type { GetSponsorshipActivitiesOrder } from './getSponsorshipActivitiesOrder'; @@ -22,6 +23,10 @@ export type GetSponsorshipActivitiesParams = { * 活動ステータス (ActivityStatusの値を指定) */ activity_status?: ActivityStatus; + /** + * デザイン進捗ステータス (DesignProgressの値を指定) + */ + design_progress?: DesignProgress; /** * 協賛可否ステータス (FeasibilityStatusの値を指定) */ From 73035359bdd46bf026c72c35931dac729618ce1b Mon Sep 17 00:00:00 2001 From: wakai111 <25.y.wakai.nutfes@gmail.com> Date: Fri, 12 Jun 2026 02:26:40 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=E5=8D=94=E8=B3=9B=E6=B4=BB=E5=8B=95?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E7=B5=9E=E3=82=8A=E8=BE=BC?= =?UTF-8?q?=E3=81=BF=E6=A9=9F=E8=83=BD=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=81?= =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sponsor-activities/FilterModal.tsx | 100 +++++++++--------- .../useSponsorActivitiesQuery.ts | 11 +- .../src/pages/sponsor-activities/index.tsx | 25 +---- .../src/utils/sponsorshipActivity.ts | 6 +- 4 files changed, 63 insertions(+), 79 deletions(-) diff --git a/view/next-project/src/components/sponsor-activities/FilterModal.tsx b/view/next-project/src/components/sponsor-activities/FilterModal.tsx index db580b8bf..e96fe08de 100644 --- a/view/next-project/src/components/sponsor-activities/FilterModal.tsx +++ b/view/next-project/src/components/sponsor-activities/FilterModal.tsx @@ -1,7 +1,12 @@ import { FC, useMemo, useState } from 'react'; -import { FeasibilityStatus } from '@/generated/model'; -import { SORT_OPTIONS, SponsorActivitiesFilterType } from '@/utils/sponsorshipActivity'; +import { ActivityStatus, DesignProgress, FeasibilityStatus } from '@/generated/model'; +import { + ACTIVITY_STATUS_OPTIONS, + DESIGN_PROGRESS_OPTIONS, + SORT_OPTIONS, + SponsorActivitiesFilterType, +} from '@/utils/sponsorshipActivity'; import { CloseButton, Modal, PrimaryButton, SearchSelect, Select, Title } from '@components/common'; import { BUREAUS } from '@constants/bureaus'; import { Sponsor, SponsorStyle, User } from '@type/common'; @@ -75,13 +80,12 @@ interface BasicFilterSectionProps { selectedBureauOption: { value: string; label: string } | null; userSelectOptions: { value: string; label: string }[]; selectedUserOption: { value: string; label: string } | null; - sponsorSelectOptions: { value: string; label: string }[]; - selectedSponsorOption: { value: string; label: string } | null; draftFilterData: SponsorActivitiesFilterType; onBureauChange: (selected: { value: string; label: string } | null) => void; onUserChange: (selected: { value: string; label: string } | null) => void; - onSponsorChange: (selected: { value: string; label: string } | null) => void; onFeasibilityChange: (value: string) => void; + onActivityStatusChange: (value: string) => void; + onDesignProgressChange: (value: string) => void; onSortChange: (value: string) => void; } @@ -90,13 +94,12 @@ const BasicFilterSection: FC = ({ selectedBureauOption, userSelectOptions, selectedUserOption, - sponsorSelectOptions, - selectedSponsorOption, draftFilterData, onBureauChange, onUserChange, - onSponsorChange, onFeasibilityChange, + onActivityStatusChange, + onDesignProgressChange, onSortChange, }) => ( <> @@ -120,16 +123,6 @@ const BasicFilterSection: FC = ({ onChange={onUserChange} /> -

企業名

-
- -

協賛可否

+

活動ステータス

+
+ +
+

デザイン進捗

+
+ +

並び替え

-

活動ステータス

+

ステータス

-

デザイン進捗

+

デザイン