Approve pantry request

.env.example

@@ -0,0 +1,5 @@
+DATABASE_HOST=localhost
+DATABASE_PORT=5432
+DATABASE_NAME=securing-safe-food
+DATABASE_USERNAME=postgres
+DATABASE_PASSWORD=PLACEHOLDER_PASSWORD

.gitignore

@@ -41,3 +41,4 @@ Thumbs.db
 # Environment file
 *.env
 *.env.*
+!.env.example

README.md

@@ -1,9 +1,30 @@
-# Scaffolding
+# Securing Safe Food
 
 <a alt="Nx logo" href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="45"></a>
 
 ✨ **This workspace has been generated by [Nx, a Smart, fast and extensible build system.](https://nx.dev)** ✨
 
+## Environment Setup
+
+Install app dependencies by running this at the repo root (`ssf`)
+
+```
+yarn install
+```
+
+To setup your backend, follow the backend-specific instructions [here](apps/backend/README.md)
+
+*Note: you may need to prefix your `nx` commands with `npx`. For example, to serve the frontend, if:
+```
+nx serve frontend
+```
+
+doesn't work, try:
+
+```
+npx nx serve frontend
+```
+
 ## Start the app
 
 To start the development server run `nx serve frontend`. Open your browser and navigate to http://localhost:4200/. Happy coding!

apps/backend/README.md

@@ -0,0 +1,28 @@
+## Backend Setup
+
+This part can be a little tricky! If you run into some confusing errors along the way, don't be afraid to reach out if have any trouble!
+
+You'll need to download:
+
+1. [PostgreSQL](https://www.postgresql.org/download/)
+2. [PgAdmin 4](https://www.pgadmin.org/download/) (if PostgreSQL didn't come with it)
+
+Then, set up a database called `securing-safe-food`. If you're not familiar with how to do so, it's easy to do through PgAdmin
+
+1. Open PgAdmin and configure your credentials (if necessary). Then, right click on the `Databases` dropdown (under `Servers` > `PostgreSQL [version]`)
+
+![alt text](resources/pg-setup-1.png)
+
+2. Enter "securing-safe-food" as the database name
+
+![alt text](resources/pg-setup-2.png)
+
+Next, create a file called `.env` in the **root directory** (under `ssf/`) and copy over the contents from `.env.example`. Replace `DATABASE_PASSWORD` with the password you entered for the `postgres` user (NOT necessarily your PgAdmin master password!)
+
+You can check that your database connection details are correct by running `nx serve backend` - if you can see the following line in the terminal, then you've got it right!
+
+```
+"LOG 🚀 Application is running on: http://localhost:3000/api"
+```
+
+Finally, run `yarn run typeorm:migrate` to load all the tables into your database. If everything is set up correctly, you should see "Migration ... has been  executed successfully." in the terminal.

apps/backend/src/app.module.ts

@@ -1,29 +1,35 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-
+import { RequestsModule } from './foodRequests/request.module';
+import { PantriesModule } from './pantries/pantries.module';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { UsersModule } from './users/users.module';
 import { AuthModule } from './auth/auth.module';
-import { PluralNamingStrategy } from './strategies/plural-naming.strategy';
+import { PantriesModule } from './pantries/pantries.module';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { MulterModule } from '@nestjs/platform-express';
+import typeorm from './config/typeorm';
 
 @Module({
   imports: [
-    TypeOrmModule.forRoot({
-      type: 'mongodb',
-      host: '127.0.0.1',
-      port: 27017,
-      database: 'c4cOpsTest',
-      // username: 'root',
-      // password: 'root',
-      autoLoadEntities: true,
-      // entities: [join(__dirname, '**/**.entity.{ts,js}')],
-      // Setting synchronize: true shouldn't be used in production - otherwise you can lose production data
-      synchronize: true,
-      namingStrategy: new PluralNamingStrategy(),
+    MulterModule.register({
+      dest: './uploads',
+    }),
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [typeorm],
+    }),
+    TypeOrmModule.forRootAsync({
+      inject: [ConfigService],
+      useFactory: async (configService: ConfigService) =>
+        configService.get('typeorm'),
     }),
     UsersModule,
     AuthModule,
+    PantriesModule,
+    RequestsModule,
+    PantriesModule,
   ],
   controllers: [AppController],
   providers: [AppService],

apps/backend/src/auth/auth.controller.ts

@@ -1,11 +1,4 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Post,
-  Request,
-  UseGuards,
-} from '@nestjs/common';
+import { BadRequestException, Body, Controller, Post } from '@nestjs/common';
 
 import { SignInDto } from './dtos/sign-in.dto';
 import { SignUpDto } from './dtos/sign-up.dto';
@@ -16,7 +9,6 @@ import { DeleteUserDto } from './dtos/delete-user.dto';
 import { User } from '../users/user.entity';
 import { SignInResponseDto } from './dtos/sign-in-response.dto';
 import { RefreshTokenDto } from './dtos/refresh-token.dto';
-import { AuthGuard } from '@nestjs/passport';
 import { ConfirmPasswordDto } from './dtos/confirm-password.dto';
 import { ForgotPasswordDto } from './dtos/forgot-password.dto';
 

apps/backend/src/auth/auth.service.ts

@@ -17,7 +17,7 @@ import { SignInDto } from './dtos/sign-in.dto';
 import { SignInResponseDto } from './dtos/sign-in-response.dto';
 import { createHmac } from 'crypto';
 import { RefreshTokenDto } from './dtos/refresh-token.dto';
-import { Status } from '../users/types';
+import { Role } from '../users/types';
 import { ConfirmPasswordDto } from './dtos/confirm-password.dto';
 
 @Injectable()
@@ -60,7 +60,7 @@ export class AuthService {
 
   async signup(
     { firstName, lastName, email, password }: SignUpDto,
-    status: Status = Status.STANDARD,
+    role: Role = Role.VOLUNTEER,
   ): Promise<boolean> {
     // Needs error handling
     const signUpCommand = new SignUpCommand({
@@ -77,7 +77,7 @@ export class AuthService {
         // If you choose to do so, you'll have to first add this custom attribute in your user pool
         {
           Name: 'custom:role',
-          Value: status,
+          Value: role,
         },
       ],
     });

apps/backend/src/auth/aws-exports.ts

@@ -1,7 +1,7 @@
 const CognitoAuthConfig = {
-  userPoolId: 'USER POOL ID HERE',
-  clientId: 'CLIENT ID HERE',
-  region: 'us-east-2',
+  userPoolId: 'us-east-1_oshVQXLX6',
+  clientId: '42bfm2o2pmk57mpm5399s0e9no',
+  region: 'us-east-1',
 };
 
 export default CognitoAuthConfig;

apps/backend/src/aws/aws-s3.module.ts

@@ -0,0 +1,10 @@
+import { Global, Module } from '@nestjs/common';
+import { AWSS3Service } from './aws-s3.service';
+
+@Global()
+@Module({
+  imports: [],
+  providers: [AWSS3Service],
+  exports: [AWSS3Service],
+})
+export class AWSS3Module {}

apps/backend/src/aws/aws-s3.service.ts

@@ -0,0 +1,48 @@
+import { Injectable } from '@nestjs/common';
+import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
+
+@Injectable()
+export class AWSS3Service {
+  private client: S3Client;
+  private readonly bucket: string;
+  private readonly region: string;
+
+  constructor() {
+    this.region = process.env.AWS_REGION || 'us-east-2';
+    this.bucket = process.env.AWS_BUCKET_NAME;
+    if (!this.bucket) {
+      throw new Error('AWS_BUCKET_NAME is not defined');
+    }
+    this.client = new S3Client({
+      region: this.region,
+      credentials: {
+        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+      },
+    });
+  }
+
+  async upload(files: Express.Multer.File[]): Promise<string[]> {
+    const uploadedFileUrls: string[] = [];
+    try {
+      for (const file of files) {
+        const fileName = file.originalname;
+
+        const command = new PutObjectCommand({
+          Bucket: this.bucket,
+          Key: fileName,
+          Body: file.buffer,
+          ContentType: file.mimetype || 'application/octet-stream',
+        });
+
+        await this.client.send(command);
+
+        const url = `https://${this.bucket}.s3.${this.region}.amazonaws.com/${fileName}`;
+        uploadedFileUrls.push(url);
+      }
+      return uploadedFileUrls;
+    } catch (error) {
+      throw new Error('File upload to AWS failed');
+    }
+  }
+}

apps/backend/src/config/typeorm.ts

@@ -0,0 +1,36 @@
+import { registerAs } from '@nestjs/config';
+import { PluralNamingStrategy } from '../strategies/plural-naming.strategy';
+import { DataSource, DataSourceOptions } from 'typeorm';
+import { User1725726359198 } from '../migrations/1725726359198-User';
+import { AddTables1726524792261 } from '../migrations/1726524792261-addTables';
+import { ReviseTables1737522923066 } from '../migrations/1737522923066-reviseTables';
+import { UpdateUserRole1737816745912 } from '../migrations/1737816745912-UpdateUserRole';
+import { UpdatePantriesTable1737906317154 } from '../migrations/1737906317154-updatePantriesTable';
+import { UpdatePantriesTable1738172265266 } from '../migrations/1738172265266-updatePantriesTable';
+import { UpdatePantriesTable1739056029076 } from '../migrations/1739056029076-updatePantriesTable';
+
+const config = {
+  type: 'postgres',
+  host: `${process.env.DATABASE_HOST}`,
+  port: parseInt(`${process.env.DATABASE_PORT}`, 10),
+  database: `${process.env.DATABASE_NAME}`,
+  username: `${process.env.DATABASE_USERNAME}`,
+  password: `${process.env.DATABASE_PASSWORD}`,
+  autoLoadEntities: true,
+  synchronize: false,
+  namingStrategy: new PluralNamingStrategy(),
+  // Glob patterns (e.g. ../migrations/**.ts) are deprecated, so we have to manually specify each migration
+  // TODO: see if there's still a way to dynamically load all migrations
+  migrations: [
+    User1725726359198,
+    AddTables1726524792261,
+    ReviseTables1737522923066,
+    UpdateUserRole1737816745912,
+    UpdatePantriesTable1737906317154,
+    UpdatePantriesTable1738172265266,
+    UpdatePantriesTable1739056029076,
+  ],
+};
+
+export default registerAs('typeorm', () => config);
+export const connectionSource = new DataSource(config as DataSourceOptions);