Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions backend/src/controllers/seasons.js
Original file line number Diff line number Diff line change
Expand Up @@ -1078,9 +1078,6 @@ const getPermissionField = (type) => {
if (type === "evaluation") {
return "permissionEvaluationV2";
}
if (type === "activity") {
return "permissionActivityV2";
}
return undefined;
};

Expand Down
5 changes: 0 additions & 5 deletions backend/src/models/Registration.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ const memoSchema = mongoose.Schema({
* @prop {boolean} permissionEnrollmentV2=false - 수강신청 권한; season.permissionEnrollmentV2에 의해 설정된다
* @prop {boolean} permissionActivityV2=false - 교육활동 권한; season.permissionActivityV2에 의해 설정된다
* @prop {boolean} permissionEvaluationV2=false - 평가 권한; season.permissionEvaluationV2에 의해 설정된다
* @prop {boolean} permissionActivityV2=false - 교육활동 권한; season.permissionActivityV2에 의해 설정된다
* @prop {Object[]} formEvaluation - season.formEvaluation
*
*/
Expand Down Expand Up @@ -119,10 +118,6 @@ const registrationSchema = mongoose.Schema({
type: Boolean,
default: false,
},
permissionActivityV2: {
type: Boolean,
default: false,
},
formEvaluation: {
type: [],
},
Expand Down
5 changes: 0 additions & 5 deletions backend/src/models/Season.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ const aiSettingsDefault = {
* @prop {TPermission} permissionEnrollmentV2 - 수강신청 권한
* @prop {TPermission} permissionActivityV2 - 교육활동 권한
* @prop {TPermission} permissionEvaluationV2 - 평가 권한
* @prop {TPermission} permissionActivityV2 - 교육활동 권한
* @prop {TFormTimetable} formTimetable - 시간표 양식
* @prop {TFormSyllabus} formSyllabus - 강의계획서 양식
* @prop {TFormEvaluationItem[]} formEvaluation - 평가 양식
Expand Down Expand Up @@ -318,10 +317,6 @@ const seasonSchema = mongoose.Schema(
type: permissionSchema,
default: permissionDefault,
},
permissionActivityV2: {
type: permissionSchema,
default: permissionDefault,
},
formTimetable: formTimetableSchema,
formSyllabus: formSyllabusSchema,
formEvaluation: {
Expand Down
4 changes: 0 additions & 4 deletions backend/src/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { router as academies } from "./academies.js";
import { router as activities } from "./activities.js";
import { router as activityTemplates } from "./activityTemplates.js";
import { router as ai } from "./ai.js";
import { router as activities } from "./activities.js";
import { router as altForms } from "./altForms.js";
import { router as altSheetRows } from "./altSheetRows.js";
import { router as archives } from "./archives.js";
Expand All @@ -18,7 +17,6 @@ import { router as notifications } from "./notifications.js";
import { router as posts } from "./posts.js";
import { router as reminders } from "./reminders.js";
import { router as registrations } from "./registrations.js";
import { router as activityTemplates } from "./activityTemplates.js";

import { router as schools } from "./schools.js";
import { router as seasons } from "./seasons.js";
Expand All @@ -38,7 +36,6 @@ export const routers = [
{ label: "activities", routes: activities },
{ label: "activity-templates", routes: activityTemplates },
{ label: "ai", routes: ai },
{ label: "activities", routes: activities },
{ label: "alt-forms", routes: altForms },
{ label: "alt-sheet-rows", routes: altSheetRows },
{ label: "archives", routes: archives },
Expand All @@ -54,7 +51,6 @@ export const routers = [
{ label: "posts", routes: posts },
{ label: "reminders", routes: reminders },
{ label: "registrations", routes: registrations },
{ label: "activity-templates", routes: activityTemplates },

{ label: "schools", routes: schools },
{ label: "seasons", routes: seasons },
Expand Down
10 changes: 0 additions & 10 deletions backend/src/services/registrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ export class RegistrationService {
userRecord.userId,
role
);
const permissionActivityV2 = hasPermission(
"activity",
seasonRecord,
userRecord.userId,
role
);

const registrationRecord = await Registration(this.academyId).create({
...getSeasonSubRecord(seasonRecord),
Expand All @@ -69,7 +63,6 @@ export class RegistrationService {
permissionEnrollmentV2,
permissionActivityV2,
permissionEvaluationV2,
permissionActivityV2,
});

return { registration: registrationRecord };
Expand Down Expand Up @@ -128,9 +121,6 @@ export const updateRegistrationPermission = async (
case "evaluation":
registrationRecord.permissionEvaluationV2 = isAllowed;
break;
case "activity":
registrationRecord.permissionActivityV2 = isAllowed;
break;
default:
return;
}
Expand Down
16 changes: 0 additions & 16 deletions backend/src/services/seasons.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ export const addSeasonPermissionException = async (
case "evaluation":
permission = seasonRecord.permissionEvaluationV2;
break;
case "activity":
permission = seasonRecord.permissionActivityV2;
break;
default:
return;
}
Expand Down Expand Up @@ -116,8 +113,6 @@ export const hasPermission = (type, seasonRecord, userId, role) => {
return _hasPermission(seasonRecord.permissionActivityV2, userId, role);
case "evaluation":
return _hasPermission(seasonRecord.permissionEvaluationV2, userId, role);
case "activity":
return _hasPermission(seasonRecord.permissionActivityV2, userId, role);
}
return false;
};
Expand Down Expand Up @@ -172,17 +167,6 @@ export const removePermissionExcepted = async (seasonRecord, userId) => {
break;
}
}
for (
let i = 0;
i < seasonRecord.permissionActivityV2.exceptions.length;
i++
) {
if (seasonRecord.permissionActivityV2.exceptions[i].userId === userId) {
seasonRecord.permissionActivityV2.exceptions.splice(i, 1);
isUpdated = true;
break;
}
}
if (isUpdated) {
await seasonRecord.save();
}
Expand Down