Skip to content

Commit 35723be

Browse files
authored
Bugfix/fix migrate (#153)
* fix migrate * fix migrate, fix get evaluation
1 parent 9cbbeb0 commit 35723be

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

server/src/api/evaluation/controllers/evaluation.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module.exports = createCoreController(
2323
({ strapi }) => ({
2424
async findOne(ctx) {
2525
const isFDSC = ctx.state?.user?.role?.type === "fdsc";
26+
const isMentor = ctx.state?.user?.role?.type === "mentor";
2627
const { id } = ctx.params;
2728
const { email } = ctx.query;
2829
const data = await strapi.entityService.findOne(
@@ -34,7 +35,10 @@ module.exports = createCoreController(
3435
);
3536
const { report, email: userEmail, ...response } = data;
3637

37-
if ((report.finished || deadlineHasPassed(report.deadline)) && !isFDSC) {
38+
if (
39+
(report.finished || deadlineHasPassed(report.deadline)) &&
40+
!(isFDSC || isMentor)
41+
) {
3842
throw new UnauthorizedError(
3943
`Perioada de evaluare a luat sfarsit. Va rugam luati legatura cu organizatia ${report.user.ongName} pentru mai multe detalii.`
4044
);

server/src/api/utils/controllers/migrate.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,27 @@ module.exports = {
88
);
99

1010
for (const user of users) {
11-
const role = user.role?.name;
11+
const role = user.role?.name?.toLowerCase();
1212

1313
//
1414
// 1️⃣ NGO migration → create join records
1515
//
16-
if (role === "Authenticated" && user.program) {
17-
await strapi.entityService.create(
18-
"api::ngos-in-program.ngos-in-program",
19-
{
20-
data: {
21-
program: user.program.id,
22-
ngo: user.id,
23-
},
24-
}
25-
);
16+
if (role === "authenticated" && user.program) {
17+
await strapi.entityService.create("api::ngo-program.ngo-program", {
18+
data: {
19+
program: user.program.id,
20+
ngo: user.id,
21+
},
22+
});
2623
}
2724

2825
//
2926
// 2️⃣ Mentor migration → create join records
3027
//
31-
if (role === "Mentor" && user.programs?.length) {
28+
if (role === "mentor" && user.programs?.length) {
3229
for (const program of user.programs) {
3330
await strapi.entityService.create(
34-
"api::mentors-in-program.mentors-in-program",
31+
"api::mentor-program.mentor-program",
3532
{
3633
data: {
3734
program: program.id,

0 commit comments

Comments
 (0)