db / wiki bug fix

ubclaunchpad · Mar 14, 2024 · 18f5b51 · 18f5b51
1 parent fcd909f
commit 18f5b51
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 52 deletions.
diff --git a/lib/wiki.stack.ts b/lib/wiki.stack.ts
@@ -8,7 +8,7 @@ import { ApiService, IApiResources } from './templates/apigateway';
 import { Role, ServicePrincipal, PolicyStatement } from 'aws-cdk-lib/aws-iam';
 config();
 
-export const WIKI_STACK_INFO: StackInfo = { NAME: 'wiki-stack' };
+export const WIKI_STACK_INFO: StackInfo = { NAME: 'hub-wiki-stack' };
 
 export class WikiStack extends LPStack {
     public STACK_INFO: StackInfo = WIKI_STACK_INFO;
@@ -50,65 +50,61 @@ export class WikiStack extends LPStack {
 
         const apiResources: IApiResources = {
             subresources: {
-                docs: {
+                areas: {
+                    endpoints: {
+                        GET: {
+                            id: 'getAreas',
+                            path: `${baseLambdaDir}/getAreas`,
+                        },
+                        POST: {
+                            id: 'createArea',
+                            path: `${baseLambdaDir}/createArea`,
+                        },
+                    },
                     subresources: {
-                        area: {
+                        '{areaid}': {
                             endpoints: {
                                 GET: {
-                                    id: 'getAreas',
-                                    path: `${baseLambdaDir}/getAreas`,
+                                    id: 'getArea',
+                                    path: `${baseLambdaDir}/getArea`,
                                 },
-                                POST: {
-                                    id: 'createArea',
-                                    path: `${baseLambdaDir}/createArea`,
+                                DELETE: {
+                                    id: 'deleteArea',
+                                    path: `${baseLambdaDir}/deleteArea`,
+                                },
+                                PATCH: {
+                                    id: 'updateArea',
+                                    path: `${baseLambdaDir}/updateArea`,
                                 },
                             },
                             subresources: {
-                                '{areaid}': {
-                                    endpoints: {
-                                        GET: {
-                                            id: 'getArea',
-                                            path: `${baseLambdaDir}/getArea`,
-                                        },
-                                        DELETE: {
-                                            id: 'deleteArea',
-                                            path: `${baseLambdaDir}/deleteArea`,
-                                        },
-                                        PATCH: {
-                                            id: 'updateArea',
-                                            path: `${baseLambdaDir}/updateArea`,
-                                        },
-                                    },
+                                doc: {
                                     subresources: {
-                                        doc: {
-                                            subresources: {
-                                                '{docid}': {
-                                                    endpoints: {
-                                                        DELETE: {
-                                                            id: 'deleteDoc',
-                                                            path: `${baseLambdaDir}/deletedoc`,
-                                                        },
-                                                        GET: {
-                                                            id: 'getDoc',
-                                                            path: `${baseLambdaDir}/getdoc`,
-                                                        },
-                                                        PUT: {
-                                                            id: 'putDoc',
-                                                            path: `${baseLambdaDir}/putdoc`,
-                                                        },
-                                                    },
-                                                    // subresources: {
-                                                    //     'content': {
-                                                    //         endpoints: {
-                                                    //             GET: {
-                                                    //                 id: 'getContent',
-                                                    //                 path: `${baseLambdaDir}/getContent`,
-                                                    //             },
-                                                    //         },
-                                                    //     },
-                                                    // },
+                                        '{docid}': {
+                                            endpoints: {
+                                                DELETE: {
+                                                    id: 'deleteDoc',
+                                                    path: `${baseLambdaDir}/deletedoc`,
+                                                },
+                                                GET: {
+                                                    id: 'getDoc',
+                                                    path: `${baseLambdaDir}/getdoc`,
+                                                },
+                                                PUT: {
+                                                    id: 'putDoc',
+                                                    path: `${baseLambdaDir}/putdoc`,
                                                 },
                                             },
+                                            // subresources: {
+                                            //     'content': {
+                                            //         endpoints: {
+                                            //             GET: {
+                                            //                 id: 'getContent',
+                                            //                 path: `${baseLambdaDir}/getContent`,
+                                            //             },
+                                            //         },
+                                            //     },
+                                            // },
                                         },
                                     },
                                 },

diff --git a/src/util/db.ts b/src/util/db.ts
@@ -38,8 +38,8 @@ export function getDatabase() {
     const db = new Kysely<Database>({
         dialect: new PlanetScaleDialect({
             host: process.env.DATABASE_HOST,
-            username: process.env.DATABASE_HOST,
-            password: process.env.DATABASE_HOST,
+            username: process.env.DATABASE_USERNAME,
+            password: process.env.DATABASE_PASSWORD,
         }),
     });