Skip to content

Revert "timimgs fix" #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlpinto25 merged 1 commit into from
Mar 27, 2026
Merged

Revert "timimgs fix" #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions apps/api/src/controllers/vote.Controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { submitVote } from '../services/vote.Service'

export const createVote = async (c: Context<AppEnv>) => {
const userId = c.get('userId')

let body: VoteRequest
try {
body = await c.req.json()
Expand All @@ -18,14 +18,14 @@ export const createVote = async (c: Context<AppEnv>) => {
if (typeof stallId !== 'number' || typeof rating !== 'number') {
return c.json({ success: false, message: 'stallId and rating must be numbers' }, 400)
}

if (rating < 0 || rating > 10) {
return c.json({ success: false, message: 'rating must be between 0 and 10' }, 400)
}

try {
const progressCount = await submitVote(c.env, userId, body)

const response: VoteResponse = {
success: true,
message: 'Vote submitted successfully',
Expand All @@ -37,9 +37,6 @@ export const createVote = async (c: Context<AppEnv>) => {
if (e.message === 'Already voted') {
return c.json({ success: false, message: 'Already voted' }, 400)
}
if (e.message === 'Voting is currently closed') {
return c.json({ success: false, message: 'Voting is currently closed' }, 403)
}
return c.json({ success: false, message: 'Internal Server Error' }, 500)
}
}
34 changes: 2 additions & 32 deletions apps/api/src/services/vote.Service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,11 @@ import { eq, count } from 'drizzle-orm'
import type { AppEnv } from '../types'
import { ensureUserExists } from './user.Service'
import { refreshStallAggregates } from './stalls.Service'
function isVotingOpen(): boolean {
const istOffset = 5.5 * 60 * 60 * 1000;
const istTime = new Date(Date.now() + istOffset);

const year = istTime.getUTCFullYear();
const month = istTime.getUTCMonth() + 1;
const day = istTime.getUTCDate();

if (year !== 2026 || month !== 3) return false;

const timeInMinutes = istTime.getUTCHours() * 60 + istTime.getUTCMinutes();
const startMins = 9 * 60 + 30; // 9:30 AM (570)

if (day === 28) {
const endMins = 22 * 60; // 10:00 PM (1320)
return timeInMinutes >= startMins && timeInMinutes <= endMins;
}

if (day === 29) {
const endMins = 12 * 60; // 12:00 PM (720)
return timeInMinutes >= startMins && timeInMinutes <= endMins;
}

return false;
}

export const submitVote = async (
env: AppEnv['Bindings'],
userId: string,
vote: VoteRequest
) => {
if (!isVotingOpen()) {
throw new Error('Voting is currently closed');
}

const { stallId, rating } = vote
const ormDb = getDb(env.DB)

Expand Down Expand Up @@ -79,11 +49,11 @@ export const submitVote = async (
.select({ stallId: ratings.stallId })
.from(ratings)
.where(eq(ratings.userId, userId));

const stallIds = userRatings
.map(r => r.stallId)
.filter((id): id is number => id !== null);

await refreshStallAggregates(env.DB, stallIds);
} else {
// Normal vote (could be qualified or not, but only this stall is affected)
Expand Down
Loading