Pascal/pichunt
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move review to separate model

Browse Source
This commit is contained in:
Pascal
2025-08-13 23:53:36 +02:00
parent befc678bdb
commit 900414727f
17 changed files with 403 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/admin/answer/[answerId]/review.post.ts
+14 -7
View File
@@ -45,23 +45,30 @@ export default defineEventHandler(async (event) => {
if (!answer) {
throw createError({ status: 404, statusText: 'Not found!' });
}
const { score, review } = await useValidatedBody(
const data = await useValidatedBody(
event,
z.object({
score: z.int().min(0).max(32767).nullable(),
review: z.string().max(256).nullable()
review: z.string().max(256).nullable(),
showcase: z.boolean().nullable().default(false),
internalNote: z.string().max(256).nullable(),
rankingValue: z.int().nullable()
})
);
await prisma.questAnswer.update({
await prisma.review.upsert({
where: {
id: answerId
answerId
},
data: {
score,
review,
update: {
...data,
reviewerId: userId
},
create: {
...data,
reviewerId: userId
}
});
return answer;
});
server/api/admin/hunt/[huntId]/showcase.get.ts
+33 -9
View File
@@ -56,7 +56,9 @@ export default defineEventHandler(async (event) => {
members: true,
answers: {
where: {
score: { gt: 0 }
review: {
score: { gt: 0 }
}
}
}
}
@@ -66,10 +68,16 @@ export default defineEventHandler(async (event) => {
description: true,
answers: {
select: {
score: true
review: {
select: {
score: true
}
}
},
where: {
score: { not: null }
review: {
score: { not: null }
}
}
}
}
@@ -88,7 +96,11 @@ export default defineEventHandler(async (event) => {
select: {
id: true,
text: true,
score: true,
review: {
select: {
score: true
}
},
picture: {
select: {
@@ -110,11 +122,21 @@ export default defineEventHandler(async (event) => {
}
},
where: {
showcase: true
review: {
showcase: true
}
},
orderBy: [
{ rankingValue: { sort: 'asc', nulls: 'last' } },
{ score: { sort: 'asc', nulls: 'last' } },
{
review: {
rankingValue: { sort: 'asc', nulls: 'last' }
}
},
{
review: {
score: { sort: 'asc', nulls: 'last' }
}
},
{ createdAt: 'asc' }
]
}
@@ -124,7 +146,9 @@ export default defineEventHandler(async (event) => {
{
answers: {
some: {
showcase: true
review: {
showcase: true
}
}
}
}
@@ -155,7 +179,7 @@ export default defineEventHandler(async (event) => {
id,
description,
answers: _count.answers,
score: answers.reduce((sum, a) => sum + (a.score || 0), 0)
score: answers.reduce((sum, a) => sum + (a.review?.score || 0), 0)
}))
.toSorted((a, b) => b.score - a.score);
server/api/admin/hunt/[huntId]/teamless.get.ts
+1 -1
View File
@@ -43,7 +43,7 @@ export default defineEventHandler(async (event) => {
const { email } = await useValidatedQuery(
event,
z.object({
email: z.string().min(3).trim()
email: z.string().trim().default('')
})
);
server/api/admin/quest/[questId]/index.get.ts
+16 -10
View File
@@ -51,6 +51,7 @@ export default defineEventHandler(async (event) => {
select: {
id: true,
text: true,
final: true,
updatedAt: true,
team: {
select: {
@@ -58,15 +59,19 @@ export default defineEventHandler(async (event) => {
name: true
}
},
score: true,
review: true,
internalNote: true,
rankingValue: true,
showcase: true,
reviewer: {
review: {
select: {
name: true,
id: true
score: true,
review: true,
internalNote: true,
rankingValue: true,
showcase: true,
reviewer: {
select: {
name: true,
id: true
}
}
}
},
member: {
@@ -83,8 +88,9 @@ export default defineEventHandler(async (event) => {
}
},
orderBy: [
{ rankingValue: { sort: 'desc', nulls: 'last' } },
{ score: { sort: 'desc', nulls: 'last' } },
{ final: 'desc' },
{ review: { rankingValue: { sort: 'desc', nulls: 'last' } } },
{ review: { score: { sort: 'desc', nulls: 'last' } } },
{
updatedAt: 'desc'
}
server/api/hunt/[huntId]/index.get.ts
+29 -6
View File
@@ -96,20 +96,42 @@ export default defineEventHandler(async (event) => {
textUnit: true,
_count: {
select: {
answers: true
answers: {
where: {
final: true,
OR: [
{
review: null
},
{
review: { score: null }
},
{
review: {
review: null
}
}
]
}
}
}
},
answers: {
select: {
id: true,
text: true,
final: true,
picture: {
select: {
url: true
}
},
score: true,
review: true,
review: {
select: {
score: true,
review: true
}
},
member: {
select: {
name: true
@@ -160,13 +182,14 @@ export default defineEventHandler(async (event) => {
const isMember = hunt.creator.id === userId || members.length > 0;
const ownTeam = teams.length > 0 ? teams[0] : null;
const mappedQuests = quests.map(({ answers, ...q }) => ({
const mappedQuests = quests.map(({ answers, _count, ...q }) => ({
...q,
unreviewed: isMember ? _count.answers : undefined,
answer: answers.length > 0 ? answers[0] : null
}));
const totalScore = mappedQuests.reduce(
(acc, q) => acc + (q.answer?.score ?? 0),
(acc, q) => acc + (q.answer?.review?.score ?? 0),
0
);
@@ -176,7 +199,7 @@ export default defineEventHandler(async (event) => {
ownTeam,
loggedIn: !!user.user,
totalScore: ownTeam !== null ? totalScore : undefined,
quests: hunt.revealQuests ? mappedQuests : null,
quests: hunt.revealQuests || isMember ? mappedQuests : null,
...hunt
};
});
server/api/quest/[questId]/index.get.ts
+13 -7
View File
@@ -50,18 +50,24 @@ export default defineEventHandler(async (event) => {
url: true
}
},
score: true,
review: true,
review: {
select: {
score: true,
review: true,
reviewer: {
select: {
name: true
}
},
updatedAt: true
}
},
member: {
select: {
name: true
}
},
reviewer: {
select: {
name: true
}
},
final: true,
createdAt: true,
updatedAt: true
},
server/api/quest/[questId]/submit.post.ts
+15 -7
View File
@@ -46,7 +46,8 @@ export default defineEventHandler(async (event) => {
id: true,
text: true,
picture: true,
updatedAt: true
updatedAt: true,
final: true
},
where: {
team: {
@@ -75,6 +76,9 @@ export default defineEventHandler(async (event) => {
if (quest.hunt.teams.length <= 0) {
throw createError({ status: 403, statusText: 'No team yet!' });
}
if (quest.answers.length > 0 && quest.answers[0].final) {
throw createError({ status: 418, statusText: 'Already marked as final!' });
}
const team = quest.hunt.teams[0];
@@ -89,7 +93,8 @@ export default defineEventHandler(async (event) => {
.file()
.mime(['image/png', 'image/jpeg', 'image/jpg'])
.max(10_000_000)
.optional()
.optional(),
final: zh.boolAsString.optional()
})
.parse(formDataObj);
@@ -113,7 +118,6 @@ export default defineEventHandler(async (event) => {
});
}
// TODO: prevent updating reviewed answers
// TODO: respect end of hunt
let picture: { creatorId: number; url: string; uuid: string } | undefined =
@@ -155,7 +159,8 @@ export default defineEventHandler(async (event) => {
data: {
memberId: userId,
text: data.answer,
pictureId: file.id
pictureId: file.id,
final: data.final
}
});
} else {
@@ -164,7 +169,8 @@ export default defineEventHandler(async (event) => {
teamId: team.id,
memberId: userId,
questId: quest.id,
text: data.answer
text: data.answer,
final: data.final
},
select: { id: true }
});
@@ -187,7 +193,8 @@ export default defineEventHandler(async (event) => {
},
data: {
memberId: userId,
text: data.answer
text: data.answer,
final: data.final
}
});
} else {
@@ -196,7 +203,8 @@ export default defineEventHandler(async (event) => {
teamId: team.id,
memberId: userId,
questId: quest.id,
text: data.answer
text: data.answer,
final: data.final
}
});
}