+
알림
@@ -59,13 +59,15 @@ export default function DesktopMenu({
list.comments.length && (
-
+
+
+
)
)
diff --git a/src/common/Molecules/Profile.tsx b/src/common/Molecules/Profile.tsx
index 449dd92..b75f91e 100644
--- a/src/common/Molecules/Profile.tsx
+++ b/src/common/Molecules/Profile.tsx
@@ -30,7 +30,6 @@ export default function Profile({
};
const src = user.profile_img || "/images/profile/DummyProfileImg.jpg";
- console.log("profile user", user.name);
return (
diff --git a/src/lib/actions/AlertAction.ts b/src/lib/actions/AlertAction.ts
index c86a74d..34bd05a 100644
--- a/src/lib/actions/AlertAction.ts
+++ b/src/lib/actions/AlertAction.ts
@@ -1,5 +1,5 @@
import connectDB from "../db";
-import { Post } from "../schema";
+import { Alert, Post } from "../schema";
export async function getAlert(userId: string) {
if (!userId) {
@@ -14,9 +14,21 @@ export async function getAlert(userId: string) {
);
if (!data) {
- return { state: false, message: "해당 계정은 알림이 없습니다." };
+ return { state: false };
}
+ // const commentCount = data.reduce((acc, el) => acc + el.comments.length, 0);
+
+ // const dataCount = new Alert({
+ // userId,
+ // count: {
+ // postComment: commentCount,
+ // },
+ // });
+
+ // const save = await dataCount.save();
+
+ // const postCommentCount = save.count.postComment;
const result = JSON.parse(JSON.stringify(data));
return { state: true, result };
@@ -24,3 +36,26 @@ export async function getAlert(userId: string) {
return { state: false, message: "알림 조회에 실패했습니다." };
}
}
+
+export async function updateAlert(userId: string, formData: FormData) {
+ const postComment = formData.get("postComment");
+ const studyComment = formData.get("studyComment");
+
+ await connectDB();
+
+ try {
+ const data = await Alert.findOneAndUpdate(
+ { userId },
+ {
+ count: {
+ postComment,
+ studyComment,
+ },
+ }
+ );
+
+ return { state: true, data };
+ } catch (error) {
+ return { state: false, message: "알림 정보에 실패했습니다." };
+ }
+}
diff --git a/src/lib/actions/userAction.ts b/src/lib/actions/userAction.ts
index 3fdac99..45404e0 100644
--- a/src/lib/actions/userAction.ts
+++ b/src/lib/actions/userAction.ts
@@ -1,5 +1,5 @@
import connectDB from "../db";
-import { Alert, User } from "../schema";
+import { User } from "../schema";
export async function getUserData(userId: string) {
await connectDB();
@@ -18,25 +18,3 @@ export async function getUserData(userId: string) {
}
}
-export async function updateAlert(userId: string, formData: FormData) {
- const postComment = formData.get("postComment");
- const studyComment = formData.get("studyComment");
-
- await connectDB();
-
- try {
- const data = await Alert.findOneAndUpdate(
- { userId },
- {
- count: {
- postComment,
- studyComment,
- },
- }
- );
-
- return { state: true, data };
- } catch (error) {
- return { state: false, message: "알림 정보에 실패했습니다." };
- }
-}
diff --git a/src/lib/schema.ts b/src/lib/schema.ts
index df7370d..2dafd6d 100644
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@ -99,7 +99,7 @@ const subStudyInfo = new mongoose.Schema({
});
const subContents = new mongoose.Schema({
- content: { type: String, default: null },
+ content: { type: String, default: "", required: true },
rules: { type: [String], default: [] },
curriculums: { type: [String], default: [] },
});
diff --git a/src/middleware.ts b/src/middleware.ts
index 75db7ba..7474557 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,7 +1,9 @@
import { NextRequest, NextResponse } from "next/server";
export async function middleware(request: NextRequest) {
- const cookieSession = request.cookies.get("authjs.session-token");
+ const cookieSession = request.cookies.get(
+ "authjs.session-token" || "__Secure-authjs.session-token"
+ );
const url = request.nextUrl;
const currentUrl = url.pathname;
const loginUrl = new URL("/login", request.url);