Skip to content

Commit 0b48f55

Browse files
committed
reorganize codebase to support adding UI
1 parent 2d21c3e commit 0b48f55

28 files changed

+56
-51
lines changed

cloudformation/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Resources:
8686
Runtime: nodejs20.x
8787
Description: !Sub "${ApplicationFriendlyName} API Lambda"
8888
FunctionName: !Sub ${ApplicationPrefix}-lambda
89-
Handler: lambda.handler
89+
Handler: api.lambda.handler
9090
MemorySize: 512
9191
Role: !GetAtt AppSecurityRoles.Outputs.MainFunctionRoleArn
9292
Timeout: 60

src/functions/cache.ts renamed to src/api/functions/cache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
PutItemCommand,
44
QueryCommand,
55
} from "@aws-sdk/client-dynamodb";
6-
import { genericConfig } from "../config.js";
6+
import { genericConfig } from "../../config.js";
77
import { marshall, unmarshall } from "@aws-sdk/util-dynamodb";
88

99
const dynamoClient = new DynamoDBClient({

src/functions/discord.ts renamed to src/api/functions/discord.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { type EventPostRequest } from "../routes/events.js";
1212
import moment from "moment-timezone";
1313

1414
import { FastifyBaseLogger } from "fastify";
15-
import { DiscordEventError } from "../errors/index.js";
15+
import { DiscordEventError } from "../../errors/index.js";
1616
import { getSecretValue } from "../plugins/auth.js";
17-
import { genericConfig } from "../config.js";
17+
import { genericConfig } from "../../config.js";
1818

1919
// https://stackoverflow.com/a/3809435/5684541
2020
// https://calendar-buff.acmuiuc.pages.dev/calendar?id=dd7af73a-3df6-4e12-b228-0d2dac34fda7&date=2024-08-30

src/functions/entraId.ts renamed to src/api/functions/entraId.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import { genericConfig } from "../config.js";
2-
import { EntraInvitationError, InternalServerError } from "../errors/index.js";
1+
import { genericConfig } from "../../config.js";
2+
import {
3+
EntraInvitationError,
4+
InternalServerError,
5+
} from "../../errors/index.js";
36
import { getSecretValue } from "../plugins/auth.js";
47
import { ConfidentialClientApplication } from "@azure/msal-node";
58
import { getItemFromCache, insertItemIntoCache } from "./cache.js";
File renamed without changes.

src/index.ts renamed to src/api/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import FastifyAuthProvider from "@fastify/auth";
55
import fastifyAuthPlugin from "./plugins/auth.js";
66
import protectedRoute from "./routes/protected.js";
77
import errorHandlerPlugin from "./plugins/errorHandler.js";
8-
import { RunEnvironment, runEnvironments } from "./roles.js";
9-
import { InternalServerError } from "./errors/index.js";
8+
import { RunEnvironment, runEnvironments } from "../roles.js";
9+
import { InternalServerError } from "../errors/index.js";
1010
import eventsPlugin from "./routes/events.js";
1111
import cors from "@fastify/cors";
1212
import fastifyZodValidationPlugin from "./plugins/validate.js";
13-
import { environmentConfig } from "./config.js";
13+
import { environmentConfig } from "../config.js";
1414
import organizationsPlugin from "./routes/organizations.js";
1515
import icalPlugin from "./routes/ics.js";
1616
import vendingPlugin from "./routes/vending.js";
File renamed without changes.

src/plugins/auth.ts renamed to src/api/plugins/auth.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import {
66
SecretsManagerClient,
77
GetSecretValueCommand,
88
} from "@aws-sdk/client-secrets-manager";
9-
import { AppRoles } from "../roles.js";
9+
import { AppRoles } from "../../roles.js";
1010
import {
1111
BaseError,
1212
InternalServerError,
1313
UnauthenticatedError,
1414
UnauthorizedError,
15-
} from "../errors/index.js";
16-
import { genericConfig, SecretConfig } from "../config.js";
15+
} from "../../errors/index.js";
16+
import { genericConfig, SecretConfig } from "../../config.js";
1717

1818
function intersection<T>(setA: Set<T>, setB: Set<T>): Set<T> {
1919
const _intersection = new Set<T>();

src/plugins/errorHandler.ts renamed to src/api/plugins/errorHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
InternalServerError,
66
NotFoundError,
77
ValidationError,
8-
} from "../errors/index.js";
8+
} from "../../errors/index.js";
99

1010
const errorHandlerPlugin = fp(async (fastify) => {
1111
fastify.setErrorHandler(

src/plugins/validate.ts renamed to src/api/plugins/validate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FastifyPluginAsync, FastifyReply, FastifyRequest } from "fastify";
22
import fp from "fastify-plugin";
3-
import { InternalServerError, ValidationError } from "../errors/index.js";
3+
import { InternalServerError, ValidationError } from "../../errors/index.js";
44
import { z, ZodError } from "zod";
55
import { fromError } from "zod-validation-error";
66

0 commit comments

Comments
 (0)