Merge branch 'main' into ashley/update-swagger-search

Author: ashleynhs

Dockerfile

@@ -2,5 +2,6 @@ FROM node:20-bullseye
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 COPY . .
+RUN rm -rf node_modules
 RUN npm install --force
 CMD npm run db:migrate && npm run start

README.md

@@ -36,6 +36,18 @@ alter user postgres with superuser;
 create database "resell-dev";
 ```
 
+Use the \l command to see if the "resell-dev" is owned by user postgres. If
+instead it is owned by another root user, drop the database via:
+```bash
+drop database "resell-dev";
+```
+and login to psql via
+```bash
+psql postgres postgres
+```
+. Then, create the database again, and it should be owned by user postgres.
+
+
 ## Connecting to DB
 
 In order to connect to the database, follow these steps:
@@ -63,6 +75,32 @@ To create/update the database objects, run:
 npm run db:migrate
 ```
 
+## Migration debugging last resort
+
+If you are encountering migrations errors, use this as a last resort
+1. Log into psql and run
+```bash
+drop database "resell-dev"
+```
+WARNING: This will delete all data in your database as well. Make sure you do not have any important data in your database.
+
+2. Create the database again via.
+```bash
+create database "resell-dev"
+```
+
+3. Delete all of the migration files in the "migrations" folder
+
+4. Create a new migration file titled "init" via.
+```bash
+npm run db:migrate:generate init
+```
+
+5. Run the migration
+```bash
+npm run db:migrate
+```
+
 ## Seeding Data for Development Environment
 
 This project includes a mechanism for seeding consistent data for the development environment using TypeORM and typeorm-seeding. The seeders generate users, posts, feedback, reviews, reports, and requests, ensuring all developers work with the same data set.

ormconfig.ts

@@ -11,6 +11,7 @@ module.exports = {
       'src/models/*.ts',
    ],
    synchronize: false,
+   migrationsRun: true,
    // namingStrategy: new SnakeNamingStrategy(),
    migrations: [
       'src/migrations/*.ts',

src/api/controllers/AuthToken.ts

@@ -1,10 +1,22 @@
-import { Body, Get, JsonController } from 'routing-controllers';
+import { Body, Get, JsonController, Post } from 'routing-controllers';
 import { getAuth } from "firebase-admin/auth";
-import { AuthTokenResponse, FcmTokenRequest } from '../../types';
+import { AuthTokenResponse, emailAndPass, FcmTokenRequest, UIDResponse } from '../../types';
 
 @JsonController('authToken/')
 export class AuthTokenController {
 
+  @Post('create/') async createAccount(@Body() info:emailAndPass): Promise<UIDResponse>{
+    const userCredential = await getAuth().createUser({
+      email: info.email,
+      password: info.password
+    });
+
+    // Firebase automatically generates a UID for this user!
+    const uid = userCredential.uid;
+    console.log("New user's UID:", uid);
+    return {uid:uid}
+  }
+
   @Get() async authorize(@Body() fcmToken: FcmTokenRequest): Promise<AuthTokenResponse> {
   try {
     const customToken = await getAuth().createCustomToken(fcmToken.token);

src/api/controllers/ChatController.ts

@@ -1,7 +1,7 @@
 import { Body, CurrentUser, ForbiddenError, JsonController, Params, Post } from 'routing-controllers';
 import { getFirestore } from 'firebase-admin/firestore';
 import { ChatParam, ChatReadParam } from '../validators/GenericRequests';
-import { CreateChatMessage,CreateAvailabilityChat, CreateProposalChat, RespondProposalChat, MessageResponse, AvailabilityResponse, ProposalResponse, ChatReadResponse } from '../../types';
+import { CreateChatMessage,CreateAvailabilityChat, CreateProposalChat, RespondProposalChat, MessageResponse, AvailabilityResponse, ProposalResponse, ChatReadResponse, CancelProposalResponse } from '../../types';
 import { UserModel } from '../../models/UserModel';
 
 const db = getFirestore();
@@ -39,6 +39,10 @@ export const updateFirestore = async (
         lastMessage: lastMessage,
       })
     }
+
+    await chatsRef.doc(chatId).update({
+      updatedAt: new Date(),
+    })
 
   }
 }
@@ -155,6 +159,30 @@ export class ChatController {
     return message;
   }
 
+  @Post('proposal/cancel/:id')
+  async cancelProposal(@CurrentUser() user: UserModel,@Params() params: ChatParam,@Body() chatBody: CreateProposalChat): Promise<CancelProposalResponse>{
+    const chatId = params.id;
+    const doc = await chatsRef.doc(chatId).get();
+    const now = new Date();
+    const message = { 
+      "type": "proposal",
+      "senderID": chatBody.senderId,
+      "timestamp": now,
+      "cancellation": true,
+      "startDate":chatBody.startDate,
+      "endDate":chatBody.endDate,
+    }
+    if (doc.exists){
+      const userCheck = await checkUsers(chatId,user.firebaseUid);
+      if (!userCheck){
+        throw new ForbiddenError("This user is not part of this chat");
+      }
+      
+    }
+    updateFirestore(chatId,doc.exists,chatBody,message,chatsRef,"");
+    return message;
+  }
+
 
   @Post(':chatId/message/:messageId')
   async markAsRead(@CurrentUser() user: UserModel,@Params() params: ChatReadParam): Promise<ChatReadResponse>{
@@ -177,12 +205,11 @@ export class ChatController {
         read: true
       });
 
-      await chatsRef.doc(chatId).update({
-        updatedAt: new Date(),
-      })
     }
     return {"read":true}
   }
+
+  
 
 }
 

src/api/controllers/NotifController.ts

@@ -16,6 +16,21 @@ export class NotifController {
       return this.notifService.getRecentNotifications(user.firebaseUid);
     }
 
+    @Get('new')
+    async getUnread(@CurrentUser() user: UserModel) {
+      return this.notifService.getUnreadNotifications(user.firebaseUid);
+    }
+
+    @Get('last7days')
+    getLast7Days(@CurrentUser() user: UserModel) {
+      return this.notifService.getNotificationsLast7Days(user.firebaseUid);
+    }
+
+    @Get('last30days')
+    getLast30Days(@CurrentUser() user: UserModel) {
+      return this.notifService.getNotificationsLast30Days(user.firebaseUid);
+    }
+
     @Post()
     async sendNotif(@Body() findTokensRequest: FindTokensRequest) {
       return this.notifService.sendNotifs(findTokensRequest);
@@ -30,4 +45,9 @@ export class NotifController {
     async sendRequestMatchNotif(@Body() matchRequest: RequestMatchNotificationRequest) {
         return this.notifService.sendRequestMatchNotification(matchRequest);
     }
+
+    @Delete('id/:id')
+    async deleteNotification(@CurrentUser() user: UserModel, @Params() params: { id: string }) {
+        return this.notifService.deleteNotification(user.firebaseUid, params.id);
+    }
 }

src/api/controllers/PostController.ts

@@ -9,6 +9,7 @@ import {
   FilterPostsRequest,
   FilterPostsByPriceRequest,
   FilterPostsByConditionRequest,
+  FilterPostsUnifiedRequest,
   GetPostResponse,
   GetPostsResponse,
   GetSearchedPostsRequest,
@@ -87,6 +88,14 @@ export class PostController {
     return { posts: await this.postService.filterByCondition(user, filterPostsByConditionRequest) };
   }
 
+  @Post('filter/')
+  async filterPosts(
+    @CurrentUser() user: UserModel,
+    @Body() filterPostsUnifiedRequest: FilterPostsUnifiedRequest
+  ): Promise<GetPostsResponse> {
+    return { posts: await this.postService.filterPostsUnified(user, filterPostsUnifiedRequest) };
+  }
+
   @Get('archive/')
   async getArchivedPosts(@CurrentUser() user: UserModel): Promise<GetPostsResponse> {
     return { posts: await this.postService.getArchivedPosts(user) };

src/api/validators/GenericRequests.ts

@@ -8,7 +8,7 @@ export class EmailParam {
 }
 
 export class UuidParam {
-  @IsUUID()
+  @IsString()
   id: Uuid;
 }
 

src/app.ts

@@ -43,7 +43,12 @@ import { ReportService } from './services/ReportService';
 import { ReportRepository } from './repositories/ReportRepository';
 import { reportToString } from './utils/Requests';
 import { CurrentUserChecker } from 'routing-controllers/types/CurrentUserChecker';
+// import { getLoadedModel } from './utils/SentenceEncoder';
 
+dotenv.config();
+
+// TODO: Figure out how to load the model when running app.ts
+// export const encoder = await getLoadedModel();
 
 async function main() {
   routingUseContainer(Container);

src/migrations/1709163288115-init.ts

@@ -63,4 +63,4 @@ export class init1709163288115 implements MigrationInterface {
         await queryRunner.query(`DROP TABLE "Request"`);
     }
 
-}
+}