From 10d7e8e972c8fef7035ff7461c5bbebbabce2c03 Mon Sep 17 00:00:00 2001
From: hikahana <22.h.hanada.nutfes@gmail.com>
Date: Tue, 19 Mar 2024 06:53:24 +0000
Subject: [PATCH 1/4] =?UTF-8?q?[feat]=20select=E3=81=ABdefaultValue?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/next-project/src/components/common/Select/Select.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/view/next-project/src/components/common/Select/Select.tsx b/view/next-project/src/components/common/Select/Select.tsx
index f292cf490..f3c8992db 100644
--- a/view/next-project/src/components/common/Select/Select.tsx
+++ b/view/next-project/src/components/common/Select/Select.tsx
@@ -7,6 +7,7 @@ interface Props {
   className?: string;
   placeholder?: string;
   value?: string | number;
+  defaultValue?: string | number;
   onChange?: (e: React.ChangeEvent<HTMLSelectElement>) => void;
   children?: React.ReactNode;
 }
@@ -21,6 +22,7 @@ function Select(props: Props): JSX.Element {
         placeholder={props.placeholder}
         className={clsx(s.select, className)}
         value={props.value}
+        defaultValue={props.defaultValue}
         onChange={props.onChange}
       >
         {props.children}

From 90f74f185de71ea90308494632442cb9dcbb27a8 Mon Sep 17 00:00:00 2001
From: hikahana <22.h.hanada.nutfes@gmail.com>
Date: Tue, 19 Mar 2024 06:55:42 +0000
Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20=E3=83=AD=E3=82=B0=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=95=E3=81=9B?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/fund_information/AddModal.tsx         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/view/next-project/src/components/fund_information/AddModal.tsx b/view/next-project/src/components/fund_information/AddModal.tsx
index b295659a6..16bac2a3c 100644
--- a/view/next-project/src/components/fund_information/AddModal.tsx
+++ b/view/next-project/src/components/fund_information/AddModal.tsx
@@ -52,6 +52,9 @@ const OpenAddModal: FC<ModalProps> = (props) => {
     return res;
   }, [bureauId]);
 
+  const loginUser = user.id;
+  const loginUserDepartment = BUREAUS.find((u) => user.bureauID === u.id)?.name;
+
   const handler =
     (input: string) =>
     (e: React.ChangeEvent<HTMLSelectElement> | React.ChangeEvent<HTMLInputElement>) => {
@@ -104,7 +107,8 @@ const OpenAddModal: FC<ModalProps> = (props) => {
         </div>
         <p className='text-black-600'>担当者の局</p>
         <div className='col-span-4 w-full'>
-          <Select value={bureauId} onChange={(e) => setBureauId(Number(e.target.value))}>
+          <Select defaultValue={loginUser} onChange={(e) => setBureauId(Number(e.target.value))}>
+            <option value={loginUser}>{loginUserDepartment}</option>
             {BUREAUS.map((bureaus) => (
               <option key={bureaus.id} value={bureaus.id}>
                 {bureaus.name}
@@ -114,7 +118,8 @@ const OpenAddModal: FC<ModalProps> = (props) => {
         </div>
         <p className='col-span-1 text-black-600'>担当者</p>
         <div className='col-span-4 w-full'>
-          <Select className='w-full' value={formData.userID} onChange={handler('userID')}>
+          <Select className='w-full' defaultValue={loginUser} onChange={handler('userID')}>
+            <option value={loginUser}>{user.name}</option>
             {filteredUsers.map((user) => (
               <option key={user.id} value={user.id}>
                 {user.name}

From 38af866882f6300d507248cd52e65f76140d82a3 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Fri, 22 Mar 2024 17:30:06 +0900
Subject: [PATCH 3/4] =?UTF-8?q?[feat]=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=82=92=E5=88=9D=E6=9C=9F?=
 =?UTF-8?q?=E5=80=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  5 +-
 .../components/fund_information/AddModal.tsx  | 55 ++++++++++++-------
 .../fund_information/OpenAddModalButton.tsx   |  2 +
 .../src/pages/fund_informations/index.tsx     |  7 ++-
 4 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4f08efae..4baf6f7a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,7 @@ api/tmp
 
 # cloudflare
 web/**/*.json
-web/**/cert.pem
\ No newline at end of file
+web/**/cert.pem
+
+tmp
+.env
diff --git a/view/next-project/src/components/fund_information/AddModal.tsx b/view/next-project/src/components/fund_information/AddModal.tsx
index 16bac2a3c..8a273af99 100644
--- a/view/next-project/src/components/fund_information/AddModal.tsx
+++ b/view/next-project/src/components/fund_information/AddModal.tsx
@@ -1,5 +1,5 @@
 import { useRouter } from 'next/router';
-import React, { Dispatch, FC, SetStateAction, useState, useMemo } from 'react';
+import React, { Dispatch, FC, SetStateAction, useState, useMemo, useEffect, use } from 'react';
 import { useRecoilState } from 'recoil';
 
 import { Modal, CloseButton, Input, Select, PrimaryButton } from '../common';
@@ -14,6 +14,7 @@ interface ModalProps {
   teachers: Teacher[];
   departments: Department[];
   users: User[];
+  currentUser?: User;
 }
 
 const OpenAddModal: FC<ModalProps> = (props) => {
@@ -28,9 +29,12 @@ const OpenAddModal: FC<ModalProps> = (props) => {
   const dd = String(today.getDate()).padStart(2, '0');
   const ymd = `${yyyy}-${mm}-${dd}`;
 
+  const [formUser, setFormUser] = useState<User | undefined>(props.currentUser);
+  const loginUserBureau = BUREAUS.find((bureau) => bureau.id === props.currentUser?.bureauID);
+
   const [formData, setFormData] = useState<FundInformation>({
-    userID: user.id,
-    teacherID: props.teachers[0].id || 1,
+    userID: formUser?.id || 0,
+    teacherID: loginUserBureau?.id || 1,
     price: 0,
     remark: '',
     isFirstCheck: false,
@@ -39,21 +43,29 @@ const OpenAddModal: FC<ModalProps> = (props) => {
   });
 
   // 担当者を局でフィルタを適用
-  const [bureauId, setBureauId] = useState<number>(1);
-  const filteredUsers = useMemo(() => {
-    const res = props.users
-      .filter((user) => {
-        return user.bureauID === bureauId;
-      })
-      .filter((user, index, self) => {
-        return self.findIndex((u) => u.name === user.name) === index;
-      });
-    if (res.length !== 0) setFormData({ ...formData, userID: res[0].id });
-    return res;
-  }, [bureauId]);
+  const [bureauId, setBureauId] = useState<number>(loginUserBureau?.id || 1);
+  const defaultfilteredUsers = props.users
+    .filter((user) => {
+      return user.bureauID === bureauId;
+    })
+    .filter((user, index, self) => {
+      return self.findIndex((u) => u.name === user.name) === index;
+    });
+  const [filteredUsers, setFilteredUsers] = useState<User[]>(defaultfilteredUsers);
 
-  const loginUser = user.id;
-  const loginUserDepartment = BUREAUS.find((u) => user.bureauID === u.id)?.name;
+  useEffect(() => {
+    if (formUser?.bureauID !== bureauId) {
+      const filteredUsers = props.users
+        .filter((user) => {
+          return user.bureauID === bureauId;
+        })
+        .filter((user, index, self) => {
+          return self.findIndex((u) => u.name === user.name) === index;
+        });
+      setFilteredUsers(filteredUsers);
+      if (filteredUsers.length !== 0) setFormData({ ...formData, userID: filteredUsers[0].id });
+    }
+  }, [bureauId]);
 
   const handler =
     (input: string) =>
@@ -107,8 +119,10 @@ const OpenAddModal: FC<ModalProps> = (props) => {
         </div>
         <p className='text-black-600'>担当者の局</p>
         <div className='col-span-4 w-full'>
-          <Select defaultValue={loginUser} onChange={(e) => setBureauId(Number(e.target.value))}>
-            <option value={loginUser}>{loginUserDepartment}</option>
+          <Select
+            defaultValue={loginUserBureau?.id}
+            onChange={(e) => setBureauId(Number(e.target.value))}
+          >
             {BUREAUS.map((bureaus) => (
               <option key={bureaus.id} value={bureaus.id}>
                 {bureaus.name}
@@ -118,8 +132,7 @@ const OpenAddModal: FC<ModalProps> = (props) => {
         </div>
         <p className='col-span-1 text-black-600'>担当者</p>
         <div className='col-span-4 w-full'>
-          <Select className='w-full' defaultValue={loginUser} onChange={handler('userID')}>
-            <option value={loginUser}>{user.name}</option>
+          <Select className='w-full' defaultValue={formUser?.id} onChange={handler('userID')}>
             {filteredUsers.map((user) => (
               <option key={user.id} value={user.id}>
                 {user.name}
diff --git a/view/next-project/src/components/fund_information/OpenAddModalButton.tsx b/view/next-project/src/components/fund_information/OpenAddModalButton.tsx
index 670166ba6..214beabc5 100644
--- a/view/next-project/src/components/fund_information/OpenAddModalButton.tsx
+++ b/view/next-project/src/components/fund_information/OpenAddModalButton.tsx
@@ -9,6 +9,7 @@ interface Props {
   teachers: Teacher[];
   departments: Department[];
   users: User[];
+  currentUser?: User;
 }
 
 export const OpenAddModalButton = (props: Props) => {
@@ -29,6 +30,7 @@ export const OpenAddModalButton = (props: Props) => {
           teachers={props.teachers}
           departments={props.departments}
           users={props.users}
+          currentUser={props.currentUser}
         />
       )}
     </>
diff --git a/view/next-project/src/pages/fund_informations/index.tsx b/view/next-project/src/pages/fund_informations/index.tsx
index e23e06c8b..a2902cb74 100644
--- a/view/next-project/src/pages/fund_informations/index.tsx
+++ b/view/next-project/src/pages/fund_informations/index.tsx
@@ -220,7 +220,12 @@ export default function FundInformations(props: Props) {
             </select>
           </div>
           <div className='hidden justify-end md:flex '>
-            <OpenAddModalButton teachers={teachers} departments={departments} users={users}>
+            <OpenAddModalButton
+              teachers={teachers}
+              departments={departments}
+              users={users}
+              currentUser={currentUser}
+            >
               学内募金登録
             </OpenAddModalButton>
           </div>

From 3285355f2b8348ab7c89ca3c2e390d89171263ed Mon Sep 17 00:00:00 2001
From: Kubosaka <Kubosaka@users.noreply.github.com>
Date: Fri, 22 Mar 2024 08:31:15 +0000
Subject: [PATCH 4/4] formatted by workflow

---
 view/next-project/src/components/fund_information/AddModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/next-project/src/components/fund_information/AddModal.tsx b/view/next-project/src/components/fund_information/AddModal.tsx
index 8a273af99..0759bea3c 100644
--- a/view/next-project/src/components/fund_information/AddModal.tsx
+++ b/view/next-project/src/components/fund_information/AddModal.tsx
@@ -1,5 +1,5 @@
 import { useRouter } from 'next/router';
-import React, { Dispatch, FC, SetStateAction, useState, useMemo, useEffect, use } from 'react';
+import React, { Dispatch, FC, SetStateAction, useState, useEffect } from 'react';
 import { useRecoilState } from 'recoil';
 
 import { Modal, CloseButton, Input, Select, PrimaryButton } from '../common';