Commit 18f1a3f8 authored by Lee Soobeom's avatar Lee Soobeom
Browse files

update debugging

parent fbaae34c
...@@ -59,7 +59,7 @@ export default function Profile() { ...@@ -59,7 +59,7 @@ export default function Profile() {
const user: Profile = await profileApi.profile(); const user: Profile = await profileApi.profile();
console.log("user in effect", user); console.log("user in effect", user);
setEmail(user.email); setEmail(user.email);
setAvatarUrl(user.avatar?.newfilename); setAvatarUrl(user.fileInfo?.newfilename);
setProfile({ ...profile, name: user.name }); setProfile({ ...profile, name: user.name });
}; };
getProfile(); getProfile();
......
...@@ -18,7 +18,7 @@ export default function BoardPage() { ...@@ -18,7 +18,7 @@ export default function BoardPage() {
// posts // posts
const getDataList = async () => { const getDataList = async () => {
const res = await postApi.getData(); const res = await postApi.getData();
setPosts(res); setPosts(res); //posts = res
}; };
const titleHandleClick = async (event: MouseEvent<HTMLButtonElement>) => { const titleHandleClick = async (event: MouseEvent<HTMLButtonElement>) => {
......
...@@ -39,6 +39,7 @@ export interface SignupUser { ...@@ -39,6 +39,7 @@ export interface SignupUser {
export interface Profile { export interface Profile {
_id: string; _id: string;
email: string; email: string;
name: string;
fileInfo: { fileInfo: {
originalfilename: string; originalfilename: string;
newfilename: string; newfilename: string;
......
...@@ -209,49 +209,53 @@ export const updateOnePost = asyncWrap(async (reqExp, res) => { ...@@ -209,49 +209,53 @@ export const updateOnePost = asyncWrap(async (reqExp, res) => {
); );
console.log("no files update", postRes2); console.log("no files update", postRes2);
} else { } else {
const oldFilesId = await postDb.getFilesByPostId(postId); if (Array.isArray(files.picture)) {
if (!(oldFilesId === undefined)) { const oldFilesId = await postDb.getFilesByPostId(postId);
for (var i = 0; i < oldFilesId?.length; i++) { if (!(oldFilesId === undefined)) {
const name = await postDb.getOriginalFileName(oldFilesId[i]); for (var i = 0; i < oldFilesId?.length; i++) {
if (!(name === undefined)) { const name = await postDb.getOriginalFileName(
oldSet.add(name); oldFilesId[i]
);
if (!(name === undefined)) {
oldSet.add(name);
}
} }
} }
} console.log("OldSet", oldSet);
console.log("OldSet", oldSet);
if (Array.isArray(files.picture)) { if (Array.isArray(files.picture)) {
for (var i = 0; i < files.picture.length; i++) { for (var i = 0; i < files.picture.length; i++) {
const newFileName = files.picture?.[i].originalFilename; const newFileName = files.picture?.[i].originalFilename;
if (!(newFileName === undefined || newFileName === null)) { if (!(newFileName === undefined || newFileName === null)) {
newSet.add(newFileName); newSet.add(newFileName);
}
} }
} }
} console.log("NewSet", newSet);
console.log("NewSet", newSet);
//유지, 삭제, 추가 구분하기 //유지, 삭제, 추가 구분하기
const trdPart = subTract(oldSet, newSet); const trdPart = subTract(oldSet, newSet);
console.log("keep", trdPart.keep); console.log("keep", trdPart.keep);
console.log("drop", trdPart.drop); console.log("drop", trdPart.drop);
console.log("add", trdPart.add); console.log("add", trdPart.add);
// 삭제 // 삭제
for (var i = 0; i < trdPart.drop.length; i++) { for (var i = 0; i < trdPart.drop.length; i++) {
const dropRes = await postDb.deleteFileByName(trdPart.drop[i]); const dropRes = await postDb.deleteFileByName(
console.log("delete counts", dropRes); trdPart.drop[i]
} );
console.log("delete counts", dropRes);
}
//유지 //유지
for (var i = 0; i < trdPart.keep.length; i++) { for (var i = 0; i < trdPart.keep.length; i++) {
const keepRes = await postDb.findByName(trdPart.keep[i]); const keepRes = await postDb.findByName(trdPart.keep[i]);
fileIdArr.push(keepRes[0]._id); fileIdArr.push(keepRes[0]._id);
// console.log("keep Id", keepRes[0]._id); // console.log("keep Id", keepRes[0]._id);
} }
//추가 //추가
if (Array.isArray(files.picture)) {
for (var i = 0; i < files.picture.length; i++) { for (var i = 0; i < files.picture.length; i++) {
const originalfilename = files.picture?.[i].originalFilename; const originalfilename = files.picture?.[i].originalFilename;
const newfilename = files.picture?.[i].newFilename; const newfilename = files.picture?.[i].newFilename;
...@@ -269,22 +273,69 @@ export const updateOnePost = asyncWrap(async (reqExp, res) => { ...@@ -269,22 +273,69 @@ export const updateOnePost = asyncWrap(async (reqExp, res) => {
} }
} }
} }
} } else {
console.log("all fileId", fileIdArr); const oldFilesId = await postDb.getFilesByPostId(postId);
if (!(oldFilesId === undefined)) {
for (var i = 0; i < oldFilesId?.length; i++) {
const name = await postDb.getOriginalFileName(
oldFilesId[i]
);
if (!(name === undefined)) {
oldSet.add(name);
}
}
}
console.log("OldSet", oldSet);
//post정보 + file정보 update const newFileName = files.picture.originalFilename;
const postRes1 = await postDb.updatePostRow( if (!(newFileName === undefined || newFileName === null)) {
{ newSet.add(newFileName);
title, }
text, console.log("NewSet", newSet);
theme,
city, //유지, 삭제, 추가 구분하기
date: Date.now(), const trdPart = subTract(oldSet, newSet);
file: fileIdArr,
}, //삭제
postId for (var i = 0; i < trdPart.drop.length; i++) {
); const dropRes = await postDb.deleteFileByName(
trdPart.drop[i]
);
console.log("delete counts", dropRes);
}
//추가
const originalfilename = files.picture.originalFilename;
const newfilename = files.picture.newFilename;
const filepath = files.picture.filepath;
for (var j = 0; j < trdPart.add.length; j++) {
const check = trdPart.add[j];
if (originalfilename === check) {
const addRes = await postDb.createFilesRow(
originalfilename,
newfilename,
filepath
);
fileIdArr.push(addRes._id);
}
}
}
} }
console.log("all fileId", fileIdArr);
//post정보 + file정보 update
const postRes1 = await postDb.updatePostRow(
{
title,
text,
theme,
city,
date: Date.now(),
file: fileIdArr,
},
postId
);
} }
} }
} }
......
import express from "express"; import express from "express";
import { postCtrl, authCtrl, fileInfoCtrl } from "../controllers"; import { postCtrl, authCtrl } from "../controllers";
const router = express.Router(); const router = express.Router();
...@@ -8,7 +8,6 @@ router.route("/").get(postCtrl.getAllPost); ...@@ -8,7 +8,6 @@ router.route("/").get(postCtrl.getAllPost);
router.route("/files/:postId").get(authCtrl.requireLogin, postCtrl.getFiles); router.route("/files/:postId").get(authCtrl.requireLogin, postCtrl.getFiles);
// router.param("postId", postCtrl.userByPostId);
router router
.route("/:postId") .route("/:postId")
.post(authCtrl.requireLogin, postCtrl.addCounts) .post(authCtrl.requireLogin, postCtrl.addCounts)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment