[fix]minioのディレクトリをyear/advertisements/filenameに変更

NUTFes · Jul 28, 2024 · aa61164 · aa61164
1 parent e4dd3df
commit aa61164
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/view/next-project/src/components/sponsoractivities/DetailModal.tsx b/view/next-project/src/components/sponsoractivities/DetailModal.tsx
@@ -13,9 +13,11 @@ interface ModalProps {
   id: React.ReactNode;
   sponsorActivitiesViewItem: SponsorActivityView;
   isDelete: boolean;
+  year: string;
 }
 
 const DetailModal: FC<ModalProps> = (props) => {
+  const { year } = props;
   const [isChange, setIsChange] = useState<boolean>(false);
   const [sponsorActivitiesView, setSponsorActivitiesView] = useState<SponsorActivityView>(
     props.sponsorActivitiesViewItem,
@@ -48,6 +50,7 @@ const DetailModal: FC<ModalProps> = (props) => {
           setSponsorActivitiesView={setSponsorActivitiesView}
           id={props.id}
           setIsChange={setIsChange}
+          year={year}
         />
       )}
     </Modal>

diff --git a/view/next-project/src/components/sponsoractivities/DetailPage2.tsx b/view/next-project/src/components/sponsoractivities/DetailPage2.tsx
@@ -24,11 +24,13 @@ interface ModalProps {
   children?: React.ReactNode;
   id: React.ReactNode;
   sponsorActivitiesViewItem: SponsorActivityView;
+  year: string;
   setIsChange: (isChange: boolean) => void;
   setSponsorActivitiesView: (sponsorActivitiesView: SponsorActivityView) => void;
 }
 
 const DetailPage2: FC<ModalProps> = (props) => {
+  const { year } = props;
   const toPage1 = () => {
     props.setPageNum(1);
   };
@@ -68,7 +70,7 @@ const DetailPage2: FC<ModalProps> = (props) => {
     sponsorActivityInformations.map((activityInformation) => {
       const bucketName = activityInformation.bucketName;
       const fileName = activityInformation.fileName;
-      return `${process.env.NEXT_PUBLIC_MINIO_ENDPONT}/${bucketName}/${fileName}`;
+      return `${process.env.NEXT_PUBLIC_MINIO_ENDPONT}/${bucketName}/${year}/advertisements/${fileName}`;
     });
 
   const download = async (url: string, fileName: string) => {
@@ -377,6 +379,7 @@ const DetailPage2: FC<ModalProps> = (props) => {
           sponsorActivityInformations={sponsorActivityInformations}
           setSponsorActivityInformations={setSponsorActivityInformations}
           setIsChange={props.setIsChange}
+          year={year}
         />
       )}
     </>

diff --git a/view/next-project/src/components/sponsoractivities/UploadFileModal.tsx b/view/next-project/src/components/sponsoractivities/UploadFileModal.tsx
@@ -11,6 +11,7 @@ interface ModalProps {
   children?: React.ReactNode;
   id: number;
   ActivityInformationId: number;
+  year: string;
   sponsorActivityInformations?: SponsorActivityInformation[];
   setSponsorActivityInformations: (
     sponsorActivityInformations: SponsorActivityInformation[],
@@ -19,6 +20,7 @@ interface ModalProps {
 }
 
 const UplaodFileModal: FC<ModalProps> = (props) => {
+  const { year } = props;
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [imageFile, setImageFile] = useState<File | null>(null);
   const [preview, setPreview] = useState({ uploadImageURL: '', type: '' });
@@ -74,8 +76,9 @@ const UplaodFileModal: FC<ModalProps> = (props) => {
     formData.append('file', imageFile);
     const fileName = imageFile?.name || '';
     formData.append('fileName', fileName);
+    formData.append('year', year);
 
-    const response = await fetch('/api/minio', {
+    const response = await fetch('/api/advertisements', {
       method: 'POST',
       body: formData,
     })

diff --git a/view/next-project/src/pages/api/minio.tsx → ...-project/src/pages/api/advertisements.tsx b/view/next-project/src/pages/api/minio.tsx → ...-project/src/pages/api/advertisements.tsx
@@ -36,7 +36,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       }
 
       const bucketName = 'finansu';
-      const fileName = files.file[0].originalFilename;
+      const year = fields.year && fields.year[0];
+      const fileName = `${year}/advertisements/${files.file[0].originalFilename}`;
       const file = files.file[0];
       const mimetype = file.mimetype;
       const metaData = {

diff --git a/view/next-project/src/pages/sponsoractivities/index.tsx b/view/next-project/src/pages/sponsoractivities/index.tsx
@@ -628,6 +628,7 @@ export default function SponsorActivities(props: Props) {
           setIsOpen={setIsOpen}
           sponsorActivitiesViewItem={sponsorActivitiesItem}
           isDelete={false}
+          year={selectedYear}
         />
       )}
     </MainLayout>