Skip to content

GitLab

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

update debugging

parent fbaae34c
Hide whitespace changes
Inline Side-by-side
frontend/src/auth/profile.tsx
View file @ 18f1a3f8
......@@ -59,7 +59,7 @@ export default function Profile() {
const user: Profile = await profileApi.profile();
console.log("user in effect", user);
setEmail(user.email);
setAvatarUrl(user.avatar?.newfilename);
setAvatarUrl(user.fileInfo?.newfilename);
setProfile({ ...profile, name: user.name });
};
getProfile();
......
frontend/src/board/board.tsx
View file @ 18f1a3f8
......@@ -18,7 +18,7 @@ export default function BoardPage() {
// posts
const getDataList = async () => {
const res = await postApi.getData();
setPosts(res);
setPosts(res); //posts = res
};
const titleHandleClick = async (event: MouseEvent<HTMLButtonElement>) => {
......
frontend/src/types/index.tsx
View file @ 18f1a3f8
......@@ -39,6 +39,7 @@ export interface SignupUser {
export interface Profile {
_id: string;
email: string;
name: string;
fileInfo: {
originalfilename: string;
newfilename: string;
......
src/controllers/post.controller.ts
View file @ 18f1a3f8
......@@ -209,49 +209,53 @@ export const updateOnePost = asyncWrap(async (reqExp, res) => {
);
console.log("no files update", postRes2);
} else {
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);
if (Array.isArray(files.picture)) {
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);
console.log("OldSet", oldSet);
if (Array.isArray(files.picture)) {
for (var i = 0; i < files.picture.length; i++) {
const newFileName = files.picture?.[i].originalFilename;
if (!(newFileName === undefined || newFileName === null)) {
newSet.add(newFileName);
if (Array.isArray(files.picture)) {
for (var i = 0; i < files.picture.length; i++) {
const newFileName = files.picture?.[i].originalFilename;
if (!(newFileName === undefined || newFileName === null)) {
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("drop", trdPart.drop);
console.log("add", trdPart.add);
console.log("keep", trdPart.keep);
console.log("drop", trdPart.drop);
console.log("add", trdPart.add);
// 삭제
for (var i = 0; i < trdPart.drop.length; i++) {
const dropRes = await postDb.deleteFileByName(trdPart.drop[i]);
console.log("delete counts", dropRes);
}
// 삭제
for (var i = 0; i < trdPart.drop.length; i++) {
const dropRes = await postDb.deleteFileByName(
trdPart.drop[i]
);
console.log("delete counts", dropRes);
}
//유지
for (var i = 0; i < trdPart.keep.length; i++) {
const keepRes = await postDb.findByName(trdPart.keep[i]);
fileIdArr.push(keepRes[0]._id);
// console.log("keep Id", keepRes[0]._id);
}
//유지
for (var i = 0; i < trdPart.keep.length; i++) {
const keepRes = await postDb.findByName(trdPart.keep[i]);
fileIdArr.push(keepRes[0]._id);
// console.log("keep Id", keepRes[0]._id);
}
//추가
if (Array.isArray(files.picture)) {
//추가
for (var i = 0; i < files.picture.length; i++) {
const originalfilename = files.picture?.[i].originalFilename;
const newfilename = files.picture?.[i].newFilename;
......@@ -269,22 +273,69 @@ export const updateOnePost = asyncWrap(async (reqExp, res) => {
}
}
}
}
console.log("all fileId", fileIdArr);
} else {
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 postRes1 = await postDb.updatePostRow(
{
title,
text,
theme,
city,
date: Date.now(),
file: fileIdArr,
},
postId
);
const newFileName = files.picture.originalFilename;
if (!(newFileName === undefined || newFileName === null)) {
newSet.add(newFileName);
}
console.log("NewSet", newSet);
//유지, 삭제, 추가 구분하기
const trdPart = subTract(oldSet, newSet);
//삭제
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
);
}
}
}
......
src/routes/post.route.ts
View file @ 18f1a3f8
import express from "express";
import { postCtrl, authCtrl, fileInfoCtrl } from "../controllers";
import { postCtrl, authCtrl } from "../controllers";
const router = express.Router();
......@@ -8,7 +8,6 @@ router.route("/").get(postCtrl.getAllPost);
router.route("/files/:postId").get(authCtrl.requireLogin, postCtrl.getFiles);
// router.param("postId", postCtrl.userByPostId);
router
.route("/:postId")
.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