Merge pull request #135 from SejongPeer/Youjiiin

feat:버디 통신 준비(end point) 변경
SejongPeer · Feb 26, 2024 · 6f3ad8a · 6f3ad8a
2 parents 70a8ac3 + 9ab6a4a
commit 6f3ad8a
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 80 deletions.
diff --git a/src/Components/Buddy/BuddyStart/BuddyStart2.js b/src/Components/Buddy/BuddyStart/BuddyStart2.js
@@ -10,7 +10,7 @@ const BuddyStart2 = () => {
     const BuddyHandler = async() => {
         try {
             const response = await fetch(
-                process.env.REACT_APP_BACK_SERVER + "/buddy/check_status",
+                process.env.REACT_APP_BACK_SERVER + "/buddy/check-matching-status",
                 {
                 method: "GET",
                 headers: {
@@ -21,22 +21,11 @@ const BuddyStart2 = () => {
                 }
             );
 
-            if (response.status === 301) {
-                alert("버디를 찾은 사용자입니다.");
-            } else if (response.status === 302) {
-                alert("버디를 찾는중인 사용자입니다.");
-                navigate("/buddy/waiting");
-            } else if (response.status === 200) {
-                navigate("/buddy/matching");
-            } else {
-                alert("로그인이 필요한 서비스입니다!");
-                navigate("/login");
-            }
+            console.log(response.data)
         } catch (error) {
             alert("로그인이 필요한 서비스입니다!");
             navigate("/login");
             console.log(error.message);
-            alert(error.message);
         }
 
     };

diff --git a/src/Components/Buddy/BuddyWaiting/BuddyWaiting.js b/src/Components/Buddy/BuddyWaiting/BuddyWaiting.js
@@ -12,7 +12,7 @@ const BuddyWaiting = ()=>{
             const response = await fetch(
               process.env.REACT_APP_BACK_SERVER + "/buddy/cancel",
               {
-                method: "POST",
+                method: "GET",
                 body: JSON.stringify(),
                 headers: {
                   "Content-Type": "application/json",
@@ -32,7 +32,8 @@ const BuddyWaiting = ()=>{
             navigate("/main");
           } catch (error) {
             console.error(error.message);
-            alert(error.message);
+            console.log(error.message);
+            alert("알 수 없는 오류가 발생했습니다.");
           }
     };
 

diff --git a/src/Components/Buddy/Matching/JS/B_Major.js b/src/Components/Buddy/Matching/JS/B_Major.js
@@ -42,6 +42,7 @@ const Major = (props) => {
 
     const clickSecondHandler = () => {
         setIsSecond(!isSecond);
+        props.sendSubMajorData(isSecond);
     }
 
 

diff --git a/src/Components/Buddy/Matching/JS/Buddy_Final.js b/src/Components/Buddy/Matching/JS/Buddy_Final.js
@@ -1,11 +1,10 @@
-import styles from "../CSS/Buddy_Final.module.css";
-import con from "../CSS/B_Container.module.css";
-import { useContext, useEffect } from "react";
-import { MyContext } from "../../../../App";
-import { useNavigate } from "react-router-dom";
-import axios from "axios";
-
-const Final = (props) => {
+import styles from '../CSS/Buddy_Final.module.css';
+import con from '../CSS/B_Container.module.css';
+import { useContext, useEffect } from 'react';
+import { MyContext } from '../../../../App';
+import { useNavigate } from 'react-router-dom';
+
+const Final = props => {
   const Page1 = () => {
     const page = 0;
     props.slideMove(page);
@@ -26,69 +25,70 @@ const Final = (props) => {
   const { buddySubmit, setBuddySubmit } = useContext(MyContext);
 
   let sameGender;
-  if (props.choiceGender === "동성") {
-    sameGender = "true";
+  if (props.choiceGender === '동성') {
+    sameGender = 'SAME';
   } else {
-    sameGender = "false";
+    sameGender = 'NO_MATTER';
   }
 
   let buddyType = {};
-  if (props.grade === "선배") {
-    buddyType = "senior";
-  } else if (props.grade === "후배") {
-    buddyType = "junior";
-  } else if (props.grade === "동기") {
-    buddyType = "friend";
+  if (props.grade === '선배') {
+    buddyType = 'SENIOR';
+  } else if (props.grade === '후배') {
+    buddyType = 'JUNIOR';
+  } else if (props.grade === '동기') {
+    buddyType = 'MATE';
   } else {
-    buddyType = "dontCare";
+    buddyType = 'NO_MATTER';
   }
 
   let buddyRange = {};
-  if (props.major === "우리 학과 버디") {
-    buddyRange = "major";
-  } else if (props.major === "우리 단과대 버디") {
-    buddyRange = "college";
+  if (props.major === '우리 학과 버디') {
+    buddyRange = 'SAME_DEPARTMENT';
+  } else if (props.major === '우리 단과대 버디') {
+    buddyRange = 'SAME_COLLEGE';
   } else {
-    buddyRange = "dontCare";
+    buddyRange = 'NO_MATTER';
   }
+  let sub = props.subMajor;
+
 
   let buddyGrades = {};
-  if (props.gradeDiff === "1") {
-    buddyGrades = "1"
-  } else if (props.gradeDiff === "2") {
-    buddyGrades = "2"
-  } else if (props.gradeDiff === "3") {
-    buddyGrades = "3"
-  } else if (props.gradeDiff === "4") {
-    buddyGrades = "4"
+  if (props.gradeDiff === '1') {
+    buddyGrades = 'GRADE_1';
+  } else if (props.gradeDiff === '2') {
+    buddyGrades = 'GRADE_2';
+  } else if (props.gradeDiff === '3') {
+    buddyGrades = 'GRADE_3';
+  } else if (props.gradeDiff === '4') {
+    buddyGrades = 'GRADE_4';
   } else {
-    buddyGrades = "any"
+    buddyGrades = 'NO_MATTER';
   }
 
-  let phoneNumber = localStorage.getItem("phoneNum");
-  let kakaoId = localStorage.getItem("kakaoId");
+  let phoneNumber = localStorage.getItem('phoneNum');
+  let kakaoId = localStorage.getItem('kakaoId');
 
   const navigate = useNavigate();
 
-  const buddySubmitHandler = async (e) => {
+  const buddySubmitHandler = async e => {
     let matchingInfo = {
-      sameGender: sameGender,
-      buddyType: buddyType,
-      buddyRange: buddyRange,
-      buddyGrades: buddyGrades,
-      phoneNumber: phoneNumber,
-      kakaoId: kakaoId,
+      genderOption : sameGender,
+      classTypeOption : buddyType,
+      collegeMajorOption : buddyRange,
+      isSubMajor : sub,
+      gradeOption : buddyGrades,
     };
     console.log(JSON.stringify(matchingInfo));
 
     try {
       const response = await fetch(
-        process.env.REACT_APP_BACK_SERVER + "/buddy/matching",
+        process.env.REACT_APP_BACK_SERVER + '/buddy/register',
         {
-          method: "POST",
+          method: 'POST',
           body: JSON.stringify(matchingInfo),
           headers: {
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
           },
         }
       );
@@ -100,22 +100,21 @@ const Final = (props) => {
         throw new Error(data.message);
       }
 
-      alert("제출 성공");
+      alert('제출 성공');
       console.log(data.message);
       setBuddySubmit(false);
-      navigate("/buddy/waiting");
+      navigate('/buddy/waiting');
     } catch (error) {
-      console.error("Error occurred:", error);
+      console.error('Error occurred:', error);
       console.error(error.message);
       alert(error.message);
       setBuddySubmit(false);
     }
-
   };
 
   useEffect(() => {
     if (buddySubmit === true) {
-        buddySubmitHandler();
+      buddySubmitHandler();
     }
   }, [buddySubmit]);
 
@@ -124,7 +123,7 @@ const Final = (props) => {
       <div className={con.titlebox}>
         <p className={con.finaltitle}>입력하신 정보를 확인해주세요</p>
       </div>
-      
+
       <div className={styles.wrapper}>
         <div className={styles.infoWrapper} onClick={Page1}>
           <div className={styles.titleWrapper}>
@@ -133,7 +132,7 @@ const Final = (props) => {
           </div>
           <div className={styles.textWrapper}>{props.choiceGender}</div>
         </div>
-      
+
         <div className={styles.infoWrapper} onClick={Page2}>
           <div className={styles.titleWrapper}>
             <div className={styles.complete}></div>
@@ -142,22 +141,22 @@ const Final = (props) => {
           <div className={styles.textWrapper}>{props.major}</div>
         </div>
 
-        <div className={styles.flex}> 
-        <div className={styles.infoWrapperHalf} onClick={Page3}>
-          <div className={styles.titleWrapper}>
-            <div className={styles.complete}></div>
-            <span>버디관계</span>
+        <div className={styles.flex}>
+          <div className={styles.infoWrapperHalf} onClick={Page3}>
+            <div className={styles.titleWrapper}>
+              <div className={styles.complete}></div>
+              <span>버디관계</span>
+            </div>
+            <div className={styles.textWrapperHalf}>{props.grade}</div>
           </div>
-          <div className={styles.textWrapperHalf}>{props.grade}</div>
-        </div>
 
-        <div className={styles.infoWrapperHalf} onClick={Page4}>
-          <div className={styles.titleWrapper}>
-            <div className={styles.complete}></div>
-            <span>버디학년</span>
+          <div className={styles.infoWrapperHalf} onClick={Page4}>
+            <div className={styles.titleWrapper}>
+              <div className={styles.complete}></div>
+              <span>버디학년</span>
+            </div>
+            <div className={styles.textWrapperHalf}>{buddyGrades}</div>
           </div>
-          <div className={styles.textWrapperHalf}>{buddyGrades}</div>
-        </div>
         </div>
 
         <div className={styles.infoWrapper}>

diff --git a/src/Components/Buddy/Matching/JS/Buddy_Matching.js b/src/Components/Buddy/Matching/JS/Buddy_Matching.js
@@ -15,6 +15,7 @@ const Buddy_Matching = () => {
   const [choiceGender, setChoiceGender] = useState("");
   const [grade, setGrade] = useState("");
   const [major, setMajor] = useState("");
+  const [subMajor, setSubMajor] = useState(false);
   const [gradeDiff, setGradeDiff] = useState("");
   const [phoneNum, setPhoneNum] = useState("");
   const [kakao, setKakao] = useState("");
@@ -90,6 +91,10 @@ const Buddy_Matching = () => {
     console.log("범위 : " + major);
     setMajor(major);
   };
+  const subMajorData = (sub) => {
+    console.log("복수/부전공");
+    setSubMajor(sub);
+  }
   const GradeDiffData = (gradeDiff) => {
     console.log("학년 : " + gradeDiff);
     setGradeDiff(gradeDiff);
@@ -99,7 +104,8 @@ const Buddy_Matching = () => {
     <div className={style.wrapper} style={mediaWidth}>
       <div className={style.formWrapper} style={Slide}>
         <ChoiceGender sendChoiceGenderData={GenderChoiceData} />
-        <Major sendMajorData={MajorData} />
+        <Major sendMajorData={MajorData} 
+        sendSubMajorData={subMajorData}/>
         <Grade sendGradeData={GradeData} />
         <GradeDiff sendGradeDiffData={GradeDiffData} />
         <Final
@@ -120,6 +126,7 @@ const Buddy_Matching = () => {
         choiceGender={choiceGender}
         grade={grade}
         major={major}
+        subMajor={subMajor}
         gradeDiff={gradeDiff}
         phoneNum={phoneNum}
         kakao={kakao}
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ const Major = (props) => { @@
         const clickSecondHandler = () => {
             setIsSecond(!isSecond);
+            props.sendSubMajorData(isSecond);
         }
@@ Expand Down @@