@@ -103,7 +102,7 @@
value={form?.fields.user ?? []}
multiple
>
- {#each filteredUsers as user}
+ {#each filteredUsers as user (user?.id)}
{/each}
@@ -115,37 +114,17 @@
>
-
-
Leaderboard
-
- Coming soon!
- -->
-
-
+ {/if}
diff --git a/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts b/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts
index 342afae..8fb97da 100644
--- a/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/admin/orders/[id]/+page.server.ts
@@ -1,13 +1,12 @@
import { db } from '$lib/server/db/index.js';
-import { project, user, devlog, t2Review } from '$lib/server/db/schema.js';
-import { error, fail, redirect } from '@sveltejs/kit';
-import { eq, and, asc, sql, desc } from 'drizzle-orm';
+import { marketItemOrder, marketItem, user } from '$lib/server/db/schema.js';
+import { error, redirect } from '@sveltejs/kit';
+import { eq, and } from 'drizzle-orm';
import type { Actions } from './$types';
import { sendSlackDM } from '$lib/server/slack.js';
-import { airtableBase } from '$lib/server/airtable';
-import { env } from '$env/dynamic/private';
import { decrypt } from '$lib/server/encryption';
import { getUserData } from '$lib/server/idvUserData';
+import { env } from '$env/dynamic/private';
export async function load({ locals, params }) {
if (!locals.user) {
@@ -19,248 +18,256 @@ export async function load({ locals, params }) {
const id: number = parseInt(params.id);
- // const [queriedProject] = await db
- // .select({
- // project: {
- // id: project.id,
- // name: project.name,
- // description: project.description,
-
- // url: project.url,
- // editorFileType: project.editorFileType,
- // editorUrl: project.editorUrl,
- // uploadedFileUrl: project.uploadedFileUrl,
- // modelFile: project.modelFile,
-
- // submittedToAirtable: project.submittedToAirtable,
-
- // createdAt: project.createdAt,
- // updatedAt: project.updatedAt,
- // status: project.status
- // },
- // user: {
- // id: user.id,
- // name: user.name,
- // slackID: user.slackId,
- // trust: user.trust,
- // hackatimeTrust: user.hackatimeTrust
- // },
- // timeSpent: sql
`COALESCE(SUM(${devlog.timeSpent}), 0)`,
- // devlogCount: sql`COALESCE(COUNT(${devlog.id}), 0)`
- // })
- // .from(project)
- // .leftJoin(devlog, and(eq(project.id, devlog.projectId), eq(devlog.deleted, false)))
- // .leftJoin(user, eq(user.id, project.userId))
- // .where(and(eq(project.id, id), eq(project.deleted, false)))
- // .groupBy(
- // project.id,
- // project.name,
- // project.description,
- // project.url,
- // project.editorFileType,
- // project.editorUrl,
- // project.uploadedFileUrl,
- // project.modelFile,
- // project.submittedToAirtable,
- // project.createdAt,
- // project.status,
- // user.id,
- // user.name,
- // user.slackId,
- // user.trust,
- // user.hackatimeTrust
- // )
- // .limit(1);
-
- // if (!queriedProject) {
- // throw error(404, { message: 'project not found' });
- // }
-
- // const devlogs = await db
- // .select()
- // .from(devlog)
- // .where(and(eq(devlog.projectId, queriedProject.project.id), eq(devlog.deleted, false)))
- // .orderBy(asc(devlog.createdAt));
-
- // return {
- // project: queriedProject,
- // devlogs,
- // reviews: await getReviewHistory(id)
- // };
+ const [orderData] = await db
+ .select({
+ order: {
+ id: marketItemOrder.id,
+ userId: marketItemOrder.userId,
+ marketItemId: marketItemOrder.marketItemId,
+ addressId: marketItemOrder.addressId,
+ bricksPaid: marketItemOrder.bricksPaid,
+ status: marketItemOrder.status,
+ userNotes: marketItemOrder.userNotes,
+ notes: marketItemOrder.notes,
+ createdAt: marketItemOrder.createdAt
+ },
+ marketItem: {
+ id: marketItem.id,
+ name: marketItem.name,
+ description: marketItem.description,
+ image: marketItem.image
+ },
+ user: {
+ id: user.id,
+ name: user.name,
+ slackId: user.slackId,
+ idvToken: user.idvToken,
+ brick: user.brick
+ }
+ })
+ .from(marketItemOrder)
+ .leftJoin(marketItem, eq(marketItem.id, marketItemOrder.marketItemId))
+ .leftJoin(user, eq(user.id, marketItemOrder.userId))
+ .where(and(eq(marketItemOrder.id, id), eq(marketItemOrder.deleted, false)))
+ .limit(1);
+
+ if (!orderData) {
+ throw error(404, { message: 'order not found' });
+ }
+
+ let address = null;
+ let userDataError = false;
+
+ if (orderData.user?.idvToken) {
+ try {
+ const token = decrypt(orderData.user.idvToken);
+ const userData = await getUserData(token);
+ address = userData?.addresses?.find(
+ (a: { id: string }) => a.id === orderData.order.addressId
+ );
+ } catch {
+ userDataError = true;
+ }
+ } else {
+ userDataError = true;
+ }
+
+ return {
+ orderData,
+ address,
+ userDataError,
+ s3PublicUrl: env.S3_PUBLIC_URL
+ };
}
-// export const actions = {
-// default: async ({ locals, request, params }) => {
-// if (!locals.user) {
-// throw error(500);
-// }
-// if (!locals.user.hasT2Review) {
-// throw error(403, { message: 'oi get out' });
-// }
-
-// const id: number = parseInt(params.id);
-
-// const [queriedProject] = await db
-// .select({
-// project: {
-// id: project.id,
-// name: project.name,
-// description: project.description,
-
-// url: project.url,
-// editorFileType: project.editorFileType,
-// editorUrl: project.editorUrl,
-// uploadedFileUrl: project.uploadedFileUrl,
-// submittedToAirtable: project.submittedToAirtable
-// },
-// user: {
-// id: user.id,
-// name: user.name,
-// slackId: user.slackId,
-// idvId: user.idvId,
-// idvToken: user.idvToken,
-// trust: user.trust,
-// hackatimeTrust: user.hackatimeTrust
-// },
-// timeSpent: sql`COALESCE(SUM(${devlog.timeSpent}), 0)`,
-// devlogCount: sql`COALESCE(COUNT(${devlog.id}), 0)`
-// })
-// .from(project)
-// .leftJoin(devlog, and(eq(project.id, devlog.projectId), eq(devlog.deleted, false)))
-// .leftJoin(user, eq(user.id, project.userId))
-// .where(and(eq(project.id, id), eq(project.deleted, false)))
-// .groupBy(
-// project.id,
-// project.name,
-// project.description,
-// project.url,
-// project.editorFileType,
-// project.editorUrl,
-// project.uploadedFileUrl,
-// user.id,
-// user.name,
-// user.slackId,
-// user.idvId,
-// user.idvToken,
-// user.trust,
-// user.hackatimeTrust
-// )
-// .limit(1);
-
-// if (!queriedProject) {
-// return error(404, { message: 'project not found' });
-// }
-
-// const data = await request.formData();
-// const notes = data.get('notes')?.toString();
-// const feedback = data.get('feedback')?.toString();
-
-// if (notes === null || feedback === null) {
-// return error(400);
-// }
-
-// const status: typeof project.status._.data | undefined = 'finalized';
-// const statusMessage = 'finalised! :woah-dino:';
-
-// if (airtableBase && !queriedProject.project.submittedToAirtable) {
-// const [latestDevlog] = await db
-// .select({
-// image: devlog.image
-// })
-// .from(devlog)
-// .where(and(eq(devlog.projectId, id), eq(devlog.deleted, false)))
-// .orderBy(desc(devlog.createdAt))
-// .limit(1);
-
-// if (!queriedProject.user?.idvToken) {
-// return fail(400, {
-// message: 'IDV token revoked/expired, ask them to reauthenticate'
-// });
-// }
-
-// const token = decrypt(queriedProject.user.idvToken);
-// let userData;
-
-// try {
-// userData = await getUserData(token);
-// } catch {
-// return fail(400, {
-// message: 'IDV token revoked/expired, ask them to reauthenticate'
-// });
-// }
-// const { first_name, last_name, primary_email, birthday, addresses } = userData;
-
-// const address = addresses.find((address: { primary: boolean; }) => address.primary);
-
-// const repoUrl =
-// queriedProject.project.editorFileType === 'upload'
-// ? `${env.S3_PUBLIC_URL}/${queriedProject.project.uploadedFileUrl}`
-// : queriedProject.project.editorFileType === 'url'
-// ? queriedProject.project.editorUrl
-// : '';
-
-// const justificationAppend = `Project has ${queriedProject.devlogCount} ${queriedProject.devlogCount == 1 ? 'journal' : 'journals'} over ${Math.floor(
-// queriedProject.timeSpent / 60
-// )}h ${queriedProject.timeSpent % 60}min, each one with a 3d model file to show progress.\nAll journals can be found here: https://construct.hackclub.com/dashboard/projects/${queriedProject.project.id}`;
-
-// await airtableBase('YSWS Project Submission').create({
-// 'Repository URL': repoUrl ?? '',
-// 'Demo URL': queriedProject.project.url ?? '',
-// Description: queriedProject.project.description ?? '',
-
-// 'First Name': first_name ?? '',
-// 'Last Name': last_name ?? '',
-// 'Email': primary_email ?? '',
-// 'Birthday': birthday ?? '',
-// 'Address (Line 1)': address?.line_1 ?? '',
-// 'City': address?.city ?? '',
-// 'State / Province': address?.state ?? '',
-// 'Country': address?.country ?? '',
-// 'ZIP / Postal Code': address?.postal_code ?? '',
-
-// 'Hours estimate': queriedProject.timeSpent / 60,
-// 'Optional - Override Hours Spent': queriedProject.timeSpent / 60,
-// 'Optional - Override Hours Spent Justification': notes
-// ? notes + '\n' + justificationAppend
-// : justificationAppend,
-// Screenshot: [
-// {
-// url: env.S3_PUBLIC_URL + '/' + latestDevlog.image
-// }
-// // eslint-disable-next-line @typescript-eslint/no-explicit-any
-// ] as any,
-// 'Slack Username': queriedProject.user?.name,
-// idv_rec: queriedProject.user?.idvId,
-// 'Identity Verified': true,
-// 'Temp hold': false
-// });
-// }
-
-// await db.insert(t2Review).values({
-// projectId: id,
-// userId: locals.user.id,
-// currencyMultiplier: 1.0, // TODO: implement
-// notes,
-// feedback
-// });
-
-// await db
-// .update(project)
-// .set({
-// status,
-// submittedToAirtable: true
-// })
-// .where(eq(project.id, id));
-
-// if (queriedProject.user) {
-// const feedbackText = feedback ? `\n\nHere's what they said:\n${feedback}` : '';
-
-// await sendSlackDM(
-// queriedProject.user.slackId,
-// `Your project has been ${statusMessage}${feedbackText}`
-// );
-// }
-
-// return redirect(302, '/dashboard/admin/review');
-// }
-// } satisfies Actions;
+export const actions = {
+ markShipped: async ({ locals, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasAdmin) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ const [orderData] = await db
+ .select({
+ order: {
+ id: marketItemOrder.id,
+ notes: marketItemOrder.notes
+ },
+ marketItem: {
+ name: marketItem.name
+ },
+ user: {
+ id: user.id,
+ slackId: user.slackId
+ }
+ })
+ .from(marketItemOrder)
+ .leftJoin(marketItem, eq(marketItem.id, marketItemOrder.marketItemId))
+ .leftJoin(user, eq(user.id, marketItemOrder.userId))
+ .where(and(eq(marketItemOrder.id, id), eq(marketItemOrder.deleted, false)))
+ .limit(1);
+
+ if (!orderData) {
+ throw error(404, { message: 'order not found' });
+ }
+
+ await db
+ .update(marketItemOrder)
+ .set({
+ status: 'fulfilled'
+ })
+ .where(eq(marketItemOrder.id, id));
+
+ if (orderData.user?.slackId) {
+ const notesText = orderData.order.notes ? `\n\nNotes: ${orderData.order.notes}` : '';
+ await sendSlackDM(
+ orderData.user.slackId,
+ `Your order for ${orderData.marketItem?.name || 'a market item'} just got shipped! :package: :package: :package:\n\n${notesText}`
+ );
+ }
+
+ return { success: true, message: 'Order marked as shipped' };
+ },
+
+ refund: async ({ locals, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasAdmin) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ const [orderData] = await db
+ .select({
+ order: {
+ id: marketItemOrder.id,
+ userId: marketItemOrder.userId,
+ bricksPaid: marketItemOrder.bricksPaid
+ },
+ marketItem: {
+ name: marketItem.name
+ },
+ user: {
+ id: user.id,
+ slackId: user.slackId,
+ brick: user.brick
+ }
+ })
+ .from(marketItemOrder)
+ .leftJoin(marketItem, eq(marketItem.id, marketItemOrder.marketItemId))
+ .leftJoin(user, eq(user.id, marketItemOrder.userId))
+ .where(and(eq(marketItemOrder.id, id), eq(marketItemOrder.deleted, false)))
+ .limit(1);
+
+ if (!orderData) {
+ throw error(404, { message: 'order not found' });
+ }
+
+ // Refund the bricks
+ await db
+ .update(user)
+ .set({
+ brick: orderData.user!.brick + orderData.order.bricksPaid
+ })
+ .where(eq(user.id, orderData.order.userId));
+
+ // Mark order as refunded
+ await db
+ .update(marketItemOrder)
+ .set({
+ status: 'refunded'
+ })
+ .where(eq(marketItemOrder.id, id));
+
+ if (orderData.user?.slackId) {
+ await sendSlackDM(
+ orderData.user.slackId,
+ `Your order for ${orderData.marketItem?.name || 'a market item'} has been refunded! :oop:\nYou got your ${orderData.order.bricksPaid} bricks back`
+ );
+ }
+
+ return { success: true, message: 'Order refunded' };
+ },
+
+ deny: async ({ locals, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasAdmin) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ const [orderData] = await db
+ .select({
+ order: {
+ id: marketItemOrder.id
+ },
+ marketItem: {
+ name: marketItem.name
+ },
+ user: {
+ slackId: user.slackId
+ }
+ })
+ .from(marketItemOrder)
+ .leftJoin(marketItem, eq(marketItem.id, marketItemOrder.marketItemId))
+ .leftJoin(user, eq(user.id, marketItemOrder.userId))
+ .where(and(eq(marketItemOrder.id, id), eq(marketItemOrder.deleted, false)))
+ .limit(1);
+
+ if (!orderData) {
+ throw error(404, { message: 'order not found' });
+ }
+
+ // Mark order as denied
+ await db
+ .update(marketItemOrder)
+ .set({
+ status: 'denied'
+ })
+ .where(eq(marketItemOrder.id, id));
+
+ if (orderData.user?.slackId) {
+ await sendSlackDM(
+ orderData.user.slackId,
+ `Your order for ${orderData.marketItem?.name || 'a market item'} has been denied :dcolon:\nYou didn't get any of your bricks back :hmmm:`
+ );
+ }
+
+ return redirect(302, '/dashboard/admin/admin/orders');
+ },
+
+ updateNotes: async ({ locals, params, request }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.hasAdmin) {
+ throw error(403, { message: 'oi get out' });
+ }
+
+ const id: number = parseInt(params.id);
+ const data = await request.formData();
+ const notes = data.get('notes')?.toString();
+
+ if (notes === undefined) {
+ throw error(400, { message: 'missing notes' });
+ }
+
+ await db
+ .update(marketItemOrder)
+ .set({
+ notes
+ })
+ .where(eq(marketItemOrder.id, id));
+
+ return { success: true, message: 'Notes updated' };
+ }
+} satisfies Actions;
diff --git a/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte b/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte
index b7e4388..f1dfe0a 100644
--- a/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte
+++ b/src/routes/dashboard/admin/admin/orders/[id]/+page.svelte
@@ -1,159 +1,188 @@
-
-
+
-
-
+
+ {:else}
+
+ Order is {marketOrderStatuses[data.orderData.order.status].toLowerCase()}, no actions
+ available
+
+ {/if}
+