프로필 수정

frontend/src/auth/profile.tsx

@@ -59,11 +59,7 @@ export default function Profile() {
       formdata.append("nickname", nickname);
       console.log("both");
       await profileApi.picture(formdata);
-    } else if (!(file === undefined) && nickname === "") {
-      formdata.append("picture", file);
-      console.log("file");
-      await profileApi.picture(formdata);
-    } else if (file === undefined && !(nickname === "")) {
+    } else if (!(nickname === "")) {
       formdata.append("nickname", nickname);
       console.log("picture");
       await profileApi.picture(formdata);

src/controllers/user.controller.ts

@@ -42,36 +42,26 @@ export const postPicture = asyncWrap(async (reqExp, res) => {
   form.parse(req, (err, fields, files) => {
     if (!Array.isArray(files.picture)) {
       //파일 좁히기 중
-      if (Array.isArray(fields.nickname)) {
-        console.log(fields.nickname);
-        const nickname = fields.nickname.join();
-
-        const originalfilename = files.picture.originalFilename;
-        const newfilename = files.picture.newFilename;
-        const picturepath = files.picture.filepath;
-        userDb.postPicture(
-          userId,
-          originalfilename,
-          newfilename,
-          picturepath,
-          nickname
-        );
-      } else {
+      if (!Array.isArray(fields.nickname)) {
         const nickname = fields.nickname;
-
+        if (!(files.picture === undefined)) {
           const originalfilename = files.picture.originalFilename;
           const newfilename = files.picture.newFilename;
           const picturepath = files.picture.filepath;
           userDb.postPicture(
             userId,
+            nickname,
             originalfilename,
             newfilename,
-          picturepath,
-          nickname
+            picturepath
           );
+        } else {
+          userDb.postPicture(userId, nickname);
+        }
       }
     }
   });
+
   res.json();
 });
 

src/db/user.db.ts

@@ -73,13 +73,25 @@ export const isValidUserId = async (userId: string) => {
 
 export const postPicture = async (
   userId: ObjectId,
-  originalfilename: string | null,
-  newfilename: string,
-  picturepath: string,
-  nickname: string
+  nickname: string,
+  originalfilename?: string | null,
+  newfilename?: string,
+  picturepath?: string
 ) => {
   const profile = await User.findById(userId);
+
   if (!(profile?.avatar === undefined)) {
+    if (originalfilename === null) {
+      await Avatar.findByIdAndUpdate(profile.avatar._id, {
+        nickname: nickname,
+      });
+    } else if (nickname === "") {
+      await Avatar.findByIdAndUpdate(profile.avatar._id, {
+        originalfilename: originalfilename,
+        newfilename: newfilename,
+        picturepath: picturepath,
+      });
+    } else {
       await Avatar.findByIdAndUpdate(profile.avatar._id, {
         originalfilename: originalfilename,
         newfilename: newfilename,
@@ -87,6 +99,7 @@ export const postPicture = async (
         nickname: nickname,
       });
     }
+  }
 };
 
 export const deleteUser = async (userId: ObjectId) => {