Merge pull request #16 from AIVLE-School-Third-Big-Project/mergeTemp

Merge!

Author: Titosvarius

Diff for: src/routes/UserInfo.js

@@ -20,12 +20,8 @@ const SizeProfile = mongoose.model('sizeProfiles', sizeProfileSchema)
 // 사이즈 : backend -> frontend
 router.get('/api/size', async (req, res) => {
   const { userId } = req.query
-  console.log(`get /userInfo/api/size ${userId}`)
-
   try {
     const sizeProfile = await SizeProfile.findOne({ userId: userId })
-    console.log(sizeProfile)
-
     res.status(201).json({ success: true, message: sizeProfile })
   } catch (error) {
     console.error('Error finding size :', error)
@@ -37,7 +33,7 @@ router.get('/api/info', async (req, res) => {
   const { userId } = req.query
 
   try {
-    const user = await User.findById(userId)
+    const user = await User.findById({ _id: userId })
     if (!user) {
       return res
         .status(404)
@@ -53,6 +49,28 @@ router.get('/api/info', async (req, res) => {
   }
 })
 
+// 사용자 정보 업데이트
+router.put('/api/privacy', async (req, res) => {
+  const user = req.body
+  const userId = user.userId
+
+  const update = {
+    $set: user,
+  }
+
+  try {
+    const result = await User.findByIdAndUpdate({ _id: userId }, update)
+
+    res.status(201).json({ success: true, code: 0, user: result })
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      code: error.code,
+      message: 'An error occurred while updating the document.',
+    })
+  }
+})
+
 // 사용자 신체 이미지 경로 전송
 router.get('/api/userimage', async (req, res) => {
   const { userId } = req.query

Diff for: style/src/components/MyPage/MyPage.js

@@ -10,6 +10,7 @@ function MyPage({ currPage = 'privacy' }) {
   const [page, setPage] = useState(currPage)
   const [isSaveComplete, setIsSaveComplete] = useState(false)
   const [isShowAlert, setIsShowAlert] = useState(false)
+  const [errorCode, setErrorCode] = useState(false)
 
   const changePage = (pageName) => {
     setPage(pageName)
@@ -29,16 +30,26 @@ function MyPage({ currPage = 'privacy' }) {
             page={page}
             setIsShowAlert={setIsShowAlert}
             setIsSaveComplete={setIsSaveComplete}
+            setErrorCode={setErrorCode}
           />
         </div>
-        {isSaveComplete ? (
+        {isSaveComplete && (
           <AlertMessage
             variant="success"
             message={'저장에 성공하였습니다.'}
             show={isShowAlert}
             setShow={setIsShowAlert}
           />
-        ) : (
+        )}
+        {!isSaveComplete && errorCode === 11000 && (
+          <AlertMessage
+            variant="danger"
+            message={'저장에 실패하였습니다. 중복되는 이메일입니다.'}
+            show={isShowAlert}
+            setShow={setIsShowAlert}
+          />
+        )}
+        {!isSaveComplete && errorCode !== 11000 && (
           <AlertMessage
             variant="danger"
             message={'저장에 실패하였습니다. 다시 한번 시도해 주세요.'}

Diff for: style/src/components/MyPage/MyPrivacy.js

@@ -6,7 +6,12 @@ import authenticatedAxios from '../../api/authenticatedAxios'
 import { API_URL } from '../../api/apiConfig'
 import { updateUser } from '../User/UpdateInfo.js'
 
-function MyPrivacy({ userId, setIsShowAlert, setIsSaveComplete }) {
+function MyPrivacy({
+  userId,
+  setIsShowAlert,
+  setIsSaveComplete,
+  setErrorCode,
+}) {
   const [name, setName] = useState('')
   const [gender, setGender] = useState('')
   const [email, setEmail] = useState('')
@@ -65,6 +70,7 @@ function MyPrivacy({ userId, setIsShowAlert, setIsSaveComplete }) {
       modifyUser.gender = gender
       updateUser(modifyUser).then((result) => {
         setIsSaveComplete(result.success)
+        setErrorCode(result.code)
         setIsShowAlert(true)
         setTimeout(() => {
           setIsShowAlert(false)

Diff for: style/src/components/MyPage/MySize.js

@@ -6,7 +6,7 @@ import { useState, useEffect } from 'react'
 import authenticatedAxios from '../../api/authenticatedAxios'
 import { API_URL } from '../../api/apiConfig'
 
-function MySize({ userId, setIsShowAlert, setIsSaveComplete }) {
+function MySize({ userId, setIsShowAlert, setIsSaveComplete, setErrorCode }) {
   const [height, setHeight] = useState(0)
   const [weight, setWeight] = useState(0)
   const [shoulderWidth, SetshoulderWidth] = useState(0)

Diff for: style/src/components/MyPage/RightSubMyPage.js

@@ -3,7 +3,12 @@ import MyPrivacy from './MyPrivacy'
 import MySize from './MySize'
 import { useSelector } from 'react-redux'
 
-function RightSubMyPage({ page, setIsShowAlert, setIsSaveComplete }) {
+function RightSubMyPage({
+  page,
+  setIsShowAlert,
+  setIsSaveComplete,
+  setErrorCode,
+}) {
   // 새로고침 or 제출 버튼 누르면 웹 페이지 리프레쉬 되면서 redux 초기화 됨
   // redux 초기화 되면서 user에 저장된 데이터 없어져서 오류 발생.
   const user = useSelector((state) => state.auth.user)
@@ -15,6 +20,7 @@ function RightSubMyPage({ page, setIsShowAlert, setIsSaveComplete }) {
           userId={user._id}
           setIsShowAlert={setIsShowAlert}
           setIsSaveComplete={setIsSaveComplete}
+          setErrorCode={setErrorCode}
         />
       )
     case 'size':
@@ -23,6 +29,7 @@ function RightSubMyPage({ page, setIsShowAlert, setIsSaveComplete }) {
           userId={user._id}
           setIsShowAlert={setIsShowAlert}
           setIsSaveComplete={setIsSaveComplete}
+          setErrorCode={setErrorCode}
         />
       )
     // case 'closet':

Diff for: style/src/components/User/UpdateInfo.js

@@ -7,15 +7,14 @@ export async function updateUser(userData) {
       `${API_URL}/userInfo/api/privacy`,
       userData
     )
-
     if (response.status === 200 || response.status === 201) {
-      return { success: true, result: response.data }
+      return response.data
     }
   } catch (error) {
     if (error.response && error.response.status >= 500) {
-      return { success: false, error: 'Server error occurred.' }
+      return error.response.data
     } else {
-      return { success: false, error: error.message }
+      return error.response.data
     }
   }
 }