Skip to content

More API Utilities #105

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

Open
TBHGodPro wants to merge 9 commits into
base: main
Choose a base branch
from
Open

More API Utilities #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bb828d
Provide `messageTs` in more places in the api
TBHGodPro Jul 2, 2024
e1b2cb4
add changing goals + send goal id in /api/goals endpoint
TBHGodPro Jul 2, 2024
cf49d41
add shop info viewer on api
TBHGodPro Jul 2, 2024
e924fa7
Merge pull request #1 from hackclub/main
TBHGodPro Jul 2, 2024
ffc7cdb
fix up message updating
TBHGodPro Jul 2, 2024
c533a96
Merge branch 'hackclub:main' into main
TBHGodPro Jul 2, 2024
69499c8
Merge branch 'hackclub:main' into main
TBHGodPro Jul 2, 2024
2d23141
fix goal changing
TBHGodPro Jul 2, 2024
f44370f
Merge branch 'hackclub:main' into main
TBHGodPro Jul 3, 2024
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
147 changes: 143 additions & 4 deletions src/extensions/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ express.get('/api/goals/:slackId', readLimit, async (req, res) => {
userId: slackUser.userId,
},
select: {
id: true,
name: true,
minutes: true,
},
Expand All @@ -368,8 +369,9 @@ express.get('/api/goals/:slackId', readLimit, async (req, res) => {
ok: true,
data: result.map(r => {
return {
id: r.id,
name: r.name,
minutes: r.minutes
minutes: r.minutes,
}
}),
}
Expand Down Expand Up @@ -430,13 +432,68 @@ express.get('/api/history/:slackId', readLimit, async (req, res) => {
ended: r.completed || r.cancelled,

work: r.metadata?.work,
messageTs: r.messageTs,
}
})
}

return res.status(200).send(response);
});

/**
* Get shop info of a user
*/
express.get('/api/shop/:slackId', readLimit, async (req, res) => {
if (!req.apiKey) {
return res.status(401).send({
ok: false,
error: 'Unauthorized',
});
}

const apiKey = scryptSync(req.apiKey, 'salt', 64).toString('hex');


const user = await prisma.user.findUnique({
where: {
apiKey
},
include: {
slackUser: {
select: {
slackId: true
}
}
}
});

if (!user || !user.slackUser?.slackId) {
return res.status(401).send({
ok: false,
error: 'Unauthorized',
});
}

const airtableUser = await AirtableAPI.User.lookupBySlack(user.slackUser.slackId);

if (!airtableUser) {
return res.status(401).send({
ok: false,
error: 'Unauthorized',
});
}

return res.status(200).send({
ok: true,
data: {
spendable: airtableUser.fields["Balance (Hours)"],
awaitingApproval: airtableUser.fields["Minutes (Pending Approval)"] / 60,
inOrders: airtableUser.fields["In Pending (Minutes)"] / 60,
spent: airtableUser.fields["Spent Fulfilled (Minutes)"] / 60,
}
})
})

/*
Write API
*/
Expand Down Expand Up @@ -556,8 +613,10 @@ express.post('/api/start/:slackId', limiter, async (req, res) => {
}
});

await updateController(session);
await updateTopLevel(session);
await Promise.all([
updateController(session),
updateTopLevel(session)
])

emitter.emit('start', session);

Expand All @@ -573,6 +632,7 @@ express.post('/api/start/:slackId', limiter, async (req, res) => {
id: session.id,
slackId: user.slackUser?.slackId,
createdAt: session.createdAt,
messageTs: assertVal(topLevel!.ts),
},
});
});
Expand Down Expand Up @@ -634,6 +694,7 @@ express.post('/api/cancel/:slackId', limiter, async (req, res) => {
id: session.id,
slackId: session.user.slackUser?.slackId,
createdAt: session.createdAt,
messageTs: session.messageTs,
},
});
} catch (error) {
Expand Down Expand Up @@ -699,9 +760,87 @@ express.post('/api/pause/:slackId', limiter, async (req, res) => {
slackId: session.user.slackUser?.slackId,
createdAt: session.createdAt,
paused: updatedSession.paused,
messageTs: session.messageTs,
},
});
} catch (error) {
emitter.emit('error', { error });
}
});

/**
* Change the goal of an active session
*/
express.post('/api/goals/:slackId', limiter, async (req, res) => {
try {
if (!req.apiKey) {
return res.status(401).send({
ok: false,
error: 'Unauthorized',
});
}

const apiKey = scryptSync(req.apiKey, 'salt', 64).toString('hex');

const session = await prisma.session.findFirst({
where: {
user: {
apiKey
},
completed: false,
cancelled: false,
},
include: {
user: {
select: {
slackUser: {
select: {
slackId: true
}
}
}
}
}
});

if (!session || !session.user.slackUser?.slackId) {
return res.status(401).send({
ok: false,
error: 'Invalid user or no active session found',
});
}

const result = await prisma.goal.findMany({
where: {
userId: session.user.slackUser.slackId,
},
select: {
id: true,
name: true,
minutes: true
},
});

if (typeof req.body.id !== 'string' || !result.find(i => i.id === req.body.id)) {
return res.status(400).send({
ok: false,
error: "Invalid Goal ID"
})
}

await Session.changeGoal(session, req.body.id);

return res.status(200).send({
ok: true,
data: {
id: session.id,
slackId: session.user.slackUser?.slackId,
createdAt: session.createdAt,
goal: result.find(i => i.id === req.body.id),
messageTs: session.messageTs,
},
});
} catch (error) {
emitter.emit('error', { error });
}
});
})
56 changes: 2 additions & 54 deletions src/extensions/slack/functions/goals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { informUser, updateController, updateTopLevel } from "../lib/lib.js";
import { emitter } from "../../../lib/emitter.js";
import { t } from "../../../lib/templates.js";
import { Loading } from "../views/loading.js";
import { Session } from "../../../lib/corelib.js";

Slack.action(Actions.OPEN_GOAL, async ({ body, client }) => {
try {
Expand Down Expand Up @@ -74,60 +75,7 @@ Slack.action(Actions.SELECT_GOAL, async ({ body, client }) => {
}
});

const oldGoal = await prisma.goal.findUniqueOrThrow({
where: {
id: session?.goalId as string
}
});

const newGoal = await prisma.goal.findUniqueOrThrow({
where: {
id: goalId
}
});

session = await prisma.session.update({
where: {
id: sessionId,
goal: {
completed: false
},
},
data: {
goal: {
connect: {
id: newGoal.id
}
}
}
});

if (session.completed || session.cancelled) {
await prisma.goal.update({
where: {
id: oldGoal.id
},
data: {
minutes: {
decrement: session.elapsed
}
}
});

await prisma.goal.update({
where: {
id: newGoal.id
},
data: {
minutes: {
increment: session.elapsed
}
}
});
}

updateTopLevel(session);
updateController(session);
session = await Session.changeGoal(session, goalId);

await client.views.update({
view_id: (body as any).view.root_view_id,
Expand Down
62 changes: 62 additions & 0 deletions src/lib/corelib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { Session as SessionType } from "@prisma/client";

import { prisma } from "./prisma.js";
import { emitter } from "./emitter.js";
import { updateController, updateTopLevel } from "../extensions/slack/lib/lib.js";

interface SessionAction {
userId?: string;
Expand Down Expand Up @@ -75,6 +76,67 @@ export class Session {

return updatedSession;
}

public static async changeGoal(session: SessionType, goalId: string) {
const oldGoal = await prisma.goal.findUniqueOrThrow({
where: {
id: session?.goalId as string
}
});

const newGoal = await prisma.goal.findUniqueOrThrow({
where: {
id: goalId
}
});

const updatedSession = await prisma.session.update({
where: {
id: session.id,
goal: {
completed: false
},
},
data: {
goal: {
connect: {
id: newGoal.id
}
}
}
});

if (session.completed || session.cancelled) {
await prisma.goal.update({
where: {
id: oldGoal.id
},
data: {
minutes: {
decrement: session.elapsed
}
}
});

await prisma.goal.update({
where: {
id: newGoal.id
},
data: {
minutes: {
increment: session.elapsed
}
}
});
}

await Promise.all([
updateController(updatedSession),
updateTopLevel(updatedSession)
])

return updatedSession;
}
}

// TODO: Metadata management
Expand Down