Merge pull request #201 from gnims-project/dev

HotFix 삭제 후 500error수정 #100

Author: dong-fa

src/components/modal/KebabButtonModal.jsx

@@ -24,7 +24,7 @@ const KebabModal = ({ setModalOpen, id }) => {
 
   const confirmDeleteHandler = () => {
     //DELETE 기능넣으면 됨
-    dispatch(__deleteSchedule([id, userId, dispatch]));
+    dispatch(__deleteSchedule({ id, userId, dispatch }));
     navigate("/main");
   };
 
@@ -35,8 +35,12 @@ const KebabModal = ({ setModalOpen, id }) => {
         {deleteModalOpen ? (
           // <DeleteScheduleModal/>
           <div className="text-black pt-8 items-center w-[300px] h-[167px] text-center rounded-[16px] fixed top-[38%] z-20 bg-white ">
-            <div className="text-[18px] font-bold flex flex-col ">해당 일정을 삭제하시겠습니까? </div>
-            <div className="mt-[14px] text-[14px] text-[#6F6F6F]">삭제된 일정은 복구가 불가능합니다.</div>
+            <div className="text-[18px] font-bold flex flex-col ">
+              해당 일정을 삭제하시겠습니까?{" "}
+            </div>
+            <div className="mt-[14px] text-[14px] text-[#6F6F6F]">
+              삭제된 일정은 복구가 불가능합니다.
+            </div>
             <button
               className="bg-[#A31414] rounded-[4px]  h-[40px] w-[127px] text-white mt-[18px]"
               onClick={confirmDeleteHandler}
@@ -54,23 +58,38 @@ const KebabModal = ({ setModalOpen, id }) => {
           //이하는 모두 케밥버튼눌렀을 때 수정&삭제 모달
           <div className=" bottom-0 w-[375px] h-[205px] rounded-t-lg bg-white fixed ">
             <div className="h-[25px]  pt-[11px]">
-              <img src={barIcon} alt="bar" className="w-[80px] h-[3px] m-auto" />
+              <img
+                src={barIcon}
+                alt="bar"
+                className="w-[80px] h-[3px] m-auto"
+              />
             </div>
             <div
               onClick={scheduleEditHandler}
               className="cursor-pointer text-[#121213] font-bold pt-[23px] h-[60px] flex row border-solid border-[rgb(226,226,226)] border-b-[1px]"
             >
-              <img src={editIcon} alt="edit" className="w-[18px] h-[18px] ml-[30px] mr-[20px]" />
+              <img
+                src={editIcon}
+                alt="edit"
+                className="w-[18px] h-[18px] ml-[30px] mr-[20px]"
+              />
               수정
             </div>
             <div
               onClick={scheduleDeleteHandler}
               className="cursor-pointer text-[#A31414] font-bold pt-[23px] h-[60px] flex row border-solid border-[rgb(226,226,226)] border-b-[1px]"
             >
-              <img src={deleteIcon} alt="delete" className="w-[24px] h-[24px] ml-[30px] mr-[20px] z-0" />
+              <img
+                src={deleteIcon}
+                alt="delete"
+                className="w-[24px] h-[24px] ml-[30px] mr-[20px] z-0"
+              />
               삭제
             </div>
-            <div className="cursor-pointer m-auto text-center pt-[22px] h-[60px] font-bold" onClick={closeModal}>
+            <div
+              className="cursor-pointer m-auto text-center pt-[22px] h-[60px] font-bold"
+              onClick={closeModal}
+            >
               닫기
             </div>
           </div>

src/redux/modules/ScheduleSlice.jsx

@@ -1,6 +1,4 @@
 import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
-import axios from "axios";
-import { useDispatch } from "react-redux";
 import { ScheduleApi } from "../../api/ScheduleApi";
 import { instance } from "../../shared/AxiosInstance";
 
@@ -22,9 +20,9 @@ const initialState = {
 };
 export const __deleteSchedule = createAsyncThunk(
   "schedule/delete",
-  async (id) => {
-    const response = await ScheduleApi.deleteScheduleApi(id[0]);
-    id[2](__getSchedule(id[1]));
+  async ({ id, userId, dispatch }) => {
+    const response = await ScheduleApi.deleteScheduleApi(id);
+    dispatch(__getSchedule({ userId: userId, sortedBy: "event.dDay" }));
     return response.data;
   }
 );