Project_Asakura/Bayshore_6r_legacy
1
0
Fork 0
mirror of https://github.com/shiroikitsu8/Bayshore_6r_legacy.git synced 2024-12-03 19:47:17 +01:00
Code

Merge pull request #44 from ghkkk090/patch-1

Browse Source 
fix terminal ocm ranking
This commit is contained in:
Luna 2022-10-09 20:36:18 +01:00 committed by GitHub
commit 05835fded6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/terminal.ts
View File

@ -631,30 +631,17 @@ export default class TerminalModule extends Module {
{ {
console.log('Current OCM Day : Competition Day / Main Draw'); console.log('Current OCM Day : Competition Day / Main Draw');
// Get Current OCM Period // Get Current OCM Period and All User's Record
let OCMCurrentPeriod = await prisma.oCMPeriod.findFirst({
where: {
competitionDbId: ocmEventDate!.dbId,
competitionId: ocmEventDate!.competitionId,
startAt:
{
lte: date, // competitionStartAt is less than current date
},
closeAt:
{
gte: date, // competitionCloseAt is greater than current date
}
}
});
let ocmParticipant = await prisma.oCMTally.findMany({ let ocmParticipant = await prisma.oCMTally.findMany({
where:{ where:{
competitionId: ocmEventDate!.competitionId, competitionId: ocmEventDate!.competitionId,
periodId: OCMCurrentPeriod!.periodId
}, },
orderBy: { orderBy: [
result: 'desc' {
result: 'desc',
periodId: 'desc'
} }
]
}) })
numOfParticipants = ocmParticipant.length; numOfParticipants = ocmParticipant.length;
@ -663,6 +650,8 @@ export default class TerminalModule extends Module {
if(ocmParticipant) if(ocmParticipant)
{ {
periodId = ocmParticipant[0].periodId;
for(let i=0; i<ocmParticipant.length; i++) for(let i=0; i<ocmParticipant.length; i++)
{ {
let cars = await prisma.car.findFirst({ let cars = await prisma.car.findFirst({