Merge pull request #100 from cuappdev/filter

Filter
cuappdev · Dec 2, 2024 · 925fb59 · 925fb59
2 parents 3197f64 + ad9b3d2
commit 925fb59
Show file tree

Hide file tree

Showing 13 changed files with 303 additions and 23 deletions.
diff --git a/src/api/controllers/PostController.ts b/src/api/controllers/PostController.ts
@@ -8,6 +8,7 @@ import {
   EditPriceResponse,
   FilterPostsRequest,
   FilterPostsByPriceRequest,
+  FilterPostsByConditionRequest,
   GetPostResponse,
   GetPostsResponse,
   GetSearchedPostsRequest,
@@ -63,6 +64,26 @@ export class PostController {
     return { posts: await this.postService.filterPostsByPrice(user, filterPostsByPriceRequest) };
   }
 
+  @Post('filterPriceHighToLow/')
+  async filterPriceHighToLow(@CurrentUser() user: UserModel): Promise<GetPostsResponse> {
+    return { posts: await this.postService.filterPriceHighToLow(user) };
+  }
+
+  @Post('filterPriceLowToHigh/')
+  async filterPriceLowToHigh(@CurrentUser() user: UserModel): Promise<GetPostsResponse> {
+    return { posts: await this.postService.filterPriceLowToHigh(user) };
+  }
+
+  @Post('filterNewlyListed/')
+  async filterNewlyListed(@CurrentUser() user: UserModel): Promise<GetPostsResponse> {
+    return { posts: await this.postService.filterNewlyListed(user) };
+  }
+
+  @Post('filterByCondition/')
+  async filterByCondition(@CurrentUser() user: UserModel, @Body() filterPostsByConditionRequest: FilterPostsByConditionRequest): Promise<GetPostsResponse> {
+    return { posts: await this.postService.filterByCondition(user, filterPostsByConditionRequest) };
+  }
+
   @Get('archive/')
   async getArchivedPosts(@CurrentUser() user: UserModel): Promise<GetPostsResponse> {
     return { posts: await this.postService.getArchivedPosts(user) };

diff --git a/src/factories/PostFactory.ts b/src/factories/PostFactory.ts
@@ -16,7 +16,8 @@ define(PostModel, (_, context?: { index?: number, user?: UserModel }) => {
   // Use consistent data for post fields, utilizing index for uniqueness
   post.title = `Sample Post Title - User ${post.user.givenName} - Index: ${index}`;
   post.description = `This is a sample description for post - User ${post.user.givenName} - Index: ${index}.`;
-  post.categories = ['Electronics', 'Books'];
+  post.category = 'Electronics';
+  post.condition = 'New';
   post.original_price = 100.00 + index;
   post.altered_price = 80.00 + index;
   post.images = [

diff --git a/src/migrations/1731271779741-updatecategories.ts b/src/migrations/1731271779741-updatecategories.ts
@@ -0,0 +1,24 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class updatecategories1731271779741 implements MigrationInterface {
+    name = 'updatecategories1731271779741'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "Post" RENAME COLUMN "categories" TO "category"`);
+        await queryRunner.query(`ALTER TABLE "Post" DROP COLUMN "category"`);
+        await queryRunner.query(`ALTER TABLE "Post" ADD "category" character varying`);
+        await queryRunner.query(`UPDATE "Post" SET "category" = 'Other' WHERE "category" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "category" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "original_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "altered_price" TYPE numeric`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "altered_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "original_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" DROP COLUMN "category"`);
+        await queryRunner.query(`ALTER TABLE "Post" ADD "category" text array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "Post" RENAME COLUMN "category" TO "categories"`);
+    }
+
+}
diff --git a/src/migrations/1732146942548-addconditiontoposts.ts b/src/migrations/1732146942548-addconditiontoposts.ts
@@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class addconditiontoposts1732146942548 implements MigrationInterface {
+    name = 'addconditiontoposts1732146942548'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "Post" ADD "condition" character varying`);
+        await queryRunner.query(`UPDATE "Post" SET "condition" = 'NEW' WHERE "condition" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "condition" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "original_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "altered_price" TYPE numeric`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "altered_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "original_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" DROP COLUMN "condition"`);
+    }
+
+}
diff --git a/src/models/PostModel.ts b/src/models/PostModel.ts
@@ -25,8 +25,11 @@ export class PostModel {
   @Column()
   description: string;
 
-  @Column("text", { array: true })
-  categories: string[];
+  @Column()
+  category: string;
+
+  @Column()
+  condition: string;
 
   @Column("numeric", { scale: 2 })
   original_price: number;
@@ -74,7 +77,8 @@ export class PostModel {
       id: this.id,
       title: this.title,
       description: this.description,
-      categories: this.categories,
+      category: this.category,
+      condition: this.condition,
       original_price: this.original_price,
       altered_price: this.altered_price,
       images: this.images,

diff --git a/src/repositories/PostRepository.ts b/src/repositories/PostRepository.ts
@@ -43,15 +43,17 @@ export class PostRepository extends AbstractRepository<PostModel> {
   public async createPost(
     title: string,
     description: string,
-    categories: string[],
+    category: string,
+    condition: string,
     price: number,
     images: string[],
     user: UserModel,
   ): Promise<PostModel> {
     const post = new PostModel();
     post.title = title;
     post.description = description;
-    post.categories = categories;
+    post.category = category;
+    post.condition = condition;
     post.original_price = price;
     post.altered_price = price;
     post.images = images;
@@ -82,11 +84,11 @@ export class PostRepository extends AbstractRepository<PostModel> {
       .getMany();
   }
 
-  public async filterPosts(category: string): Promise<PostModel[]> {
+  public async filterPosts(categories: string[]): Promise<PostModel[]> {
     return await this.repository
       .createQueryBuilder("post")
       .leftJoinAndSelect("post.user", "user")
-      .where(":category = ANY (post.categories)", { category: category })
+      .where("post.category IN (:...categories)", { categories: categories })
       .andWhere("post.archive = false")
       .getMany();
   }
@@ -101,6 +103,42 @@ export class PostRepository extends AbstractRepository<PostModel> {
       .getMany();
   }
 
+  public async filterPriceHighToLow(): Promise<PostModel[]> {
+    return await this.repository
+      .createQueryBuilder("post")
+      .leftJoinAndSelect("post.user", "user")
+      .where("post.archive = false")
+      .orderBy("CASE WHEN post.altered_price = -1 THEN post.original_price ELSE post.altered_price END", "DESC")
+      .getMany();
+  }
+
+  public async filterPriceLowToHigh(): Promise<PostModel[]> {
+    return await this.repository
+      .createQueryBuilder("post")
+      .leftJoinAndSelect("post.user", "user")
+      .where("post.archive = false")
+      .orderBy("CASE WHEN post.altered_price = -1 THEN post.original_price ELSE post.altered_price END", "ASC")
+      .getMany();
+  }
+
+  public async filterNewlyListed(): Promise<PostModel[]> {
+    return await this.repository
+      .createQueryBuilder("post")
+      .leftJoinAndSelect("post.user", "user")
+      .where("post.archive = false")
+      .orderBy("post.created", "DESC")
+      .getMany();
+  }
+
+  public async filterByCondition(conditions: string[]): Promise<PostModel[]> {
+    return await this.repository
+      .createQueryBuilder("post")
+      .leftJoinAndSelect("post.user", "user")
+      .where("post.condition IN (:...conditions)", { conditions })
+      .andWhere("post.archive = false")
+      .getMany();
+  }
+
   public async getArchivedPosts(): Promise<PostModel[]> {
     return await this.repository
       .createQueryBuilder("post")

diff --git a/src/services/PostService.ts b/src/services/PostService.ts
@@ -8,7 +8,7 @@ import { UuidParam } from '../api/validators/GenericRequests';
 import { PostModel } from '../models/PostModel';
 import { UserModel } from '../models/UserModel';
 import Repositories, { TransactionsManager } from '../repositories';
-import { CreatePostRequest, FilterPostsRequest, FilterPostsByPriceRequest, GetSearchedPostsRequest, EditPostPriceRequest } from '../types';
+import { CreatePostRequest, FilterPostsRequest, FilterPostsByPriceRequest, FilterPostsByConditionRequest, GetSearchedPostsRequest, EditPostPriceRequest } from '../types';
 import { uploadImage } from '../utils/Requests';
 import { getLoadedModel } from '../utils/SentenceEncoder';
 import { PostRepository } from 'src/repositories/PostRepository';
@@ -63,7 +63,7 @@ export class PostService {
         const imageUrl = image.data;
         images.push(imageUrl);
       }
-      const freshPost = await postRepository.createPost(post.title, post.description, post.categories, post.original_price, images, user);
+      const freshPost = await postRepository.createPost(post.title, post.description, post.category, post.condition, post.original_price, images, user);
       const requestRepository = Repositories.request(transactionalEntityManager);
       const requests = await requestRepository.getAllRequest();
       for (const request of requests) {
@@ -123,7 +123,7 @@ export class PostService {
   public async filterPosts(user: UserModel, filterPostsRequest: FilterPostsRequest): Promise<PostModel[]> {
     return this.transactions.readOnly(async (transactionalEntityManager) => {
       const postRepository = Repositories.post(transactionalEntityManager);
-      const posts = await postRepository.filterPosts(filterPostsRequest.category);
+      const posts = await postRepository.filterPosts(filterPostsRequest.categories);
       const activePosts = this.filterInactiveUserPosts(posts);
       return this.filterBlockedUserPosts(activePosts, user);
     });
@@ -138,6 +138,42 @@ export class PostService {
     })
   }
 
+  public async filterPriceHighToLow(user: UserModel): Promise<PostModel[]> {
+    return this.transactions.readOnly(async (transactionalEntityManager) => {
+      const postRepository = Repositories.post(transactionalEntityManager);
+      const posts = await postRepository.filterPriceHighToLow();
+      const activePosts = this.filterInactiveUserPosts(posts);
+      return this.filterBlockedUserPosts(activePosts, user);
+    });
+  }
+
+  public async filterPriceLowToHigh(user: UserModel): Promise<PostModel[]> {
+    return this.transactions.readOnly(async (transactionalEntityManager) => {
+      const postRepository = Repositories.post(transactionalEntityManager);
+      const posts = await postRepository.filterPriceLowToHigh();
+      const activePosts = this.filterInactiveUserPosts(posts);
+      return this.filterBlockedUserPosts(activePosts, user);
+    });
+  }
+
+  public async filterNewlyListed(user: UserModel): Promise<PostModel[]> {
+    return this.transactions.readOnly(async (transactionalEntityManager) => {
+      const postRepository = Repositories.post(transactionalEntityManager);
+      const posts = await postRepository.filterNewlyListed();
+      const activePosts = this.filterInactiveUserPosts(posts);
+      return this.filterBlockedUserPosts(activePosts, user);
+    });
+  }
+
+  public async filterByCondition(user: UserModel, filterPostsByConditionRequest: FilterPostsByConditionRequest): Promise<PostModel[]> {
+    return this.transactions.readOnly(async (transactionalEntityManager) => {
+      const postRepository = Repositories.post(transactionalEntityManager);
+      const posts = await postRepository.filterByCondition(filterPostsByConditionRequest.condition);
+      const activePosts = this.filterInactiveUserPosts(posts);
+      return this.filterBlockedUserPosts(activePosts, user);
+    });
+  }
+
   public async getArchivedPosts(user: UserModel): Promise<PostModel[]> {
     return this.transactions.readOnly(async (transactionalEntityManager) => {
       const postRepository = Repositories.post(transactionalEntityManager);