Skip to content

Commit 56a601b

Browse files
committed
fix: resistration duration
1 parent 09e068e commit 56a601b

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

back/routes/registration.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ router.post("/edit_registration", async (req, res) => {
225225

226226
console.log(req.body);
227227
const durationCheck = await checkRegistrationDuration();
228-
if (durationCheck.registrationStatus !== 1) {
229-
return res.status(400).send({ message: "활동 추가 기한이 지났습니다." });
228+
if (durationCheck.registrationStatus === 0) {
229+
return res.status(400).send({ message: "활동 수정 기한이 지났습니다." });
230230
}
231231

232232
const transaction = await sequelize.transaction();
@@ -479,6 +479,11 @@ router.get("/get_registration", async (req, res) => {
479479
});
480480
}
481481

482+
const durationCheck = await checkRegistrationDuration();
483+
if (durationCheck.registrationStatus === 0) {
484+
return res.status(400).send({ message: "활동 수정 기한이 지났습니다." });
485+
}
486+
482487
try {
483488
const registration = await Registration.findByPk(id, {
484489
include: [
@@ -1006,7 +1011,7 @@ router.post("/add_registration", async (req, res) => {
10061011

10071012
router.post("/addActivity", async (req, res) => {
10081013
const durationCheck = await checkRegistrationDuration();
1009-
if (durationCheck.registrationStatus !== 1) {
1014+
if (durationCheck.registrationStatus === 0) {
10101015
console.log("활동 추가 기한이 지났습니다.");
10111016
return res.status(400).send({ message: "활동 추가 기한이 지났습니다." });
10121017
}

back/utils/duration.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,13 @@ async function checkRegistrationDuration() {
128128
const durations = await Duration.findAll({
129129
where: {
130130
semester_id: currentSemester.id,
131-
duration_name: { [Op.or]: ["ClubRegistration", "MemberRegistration"] },
131+
duration_name: {
132+
[Op.or]: [
133+
"ClubRegistration",
134+
"ClubRegistrationModify",
135+
"MemberRegistration",
136+
],
137+
},
132138
},
133139
attributes: ["duration_name", "start_date", "end_date"],
134140
});

0 commit comments

Comments
 (0)