From 68a5b5f04305e72daedaf25e4ae80f2782b227ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20=C5=9Eafak=20Bebek?= <75090441+omersafakbebek@users.noreply.github.com> Date: Sun, 24 Dec 2023 01:46:23 +0300 Subject: [PATCH] Revert "upcoming titles feature added" --- ludos/backend/src/controllers/post.controller.ts | 3 --- ludos/backend/src/dtos/post/request/create.dto.ts | 7 ------- ludos/backend/src/dtos/post/request/update.dto.ts | 8 -------- .../src/dtos/post/response/create.response.dto.ts | 5 ----- .../src/dtos/post/response/get.response.dto.ts | 5 ----- .../src/dtos/post/response/list.response.dto.ts | 5 ----- ludos/backend/src/dtos/post/upcomingTitle.dto.ts | 12 ------------ ludos/backend/src/entities/post.entity.ts | 4 ---- ludos/backend/src/repositories/post.repository.ts | 7 ------- ludos/backend/src/services/post.service.ts | 2 -- 10 files changed, 58 deletions(-) delete mode 100644 ludos/backend/src/dtos/post/upcomingTitle.dto.ts diff --git a/ludos/backend/src/controllers/post.controller.ts b/ludos/backend/src/controllers/post.controller.ts index 3205cecc..61c5ff12 100644 --- a/ludos/backend/src/controllers/post.controller.ts +++ b/ludos/backend/src/controllers/post.controller.ts @@ -215,8 +215,6 @@ export class PostController { isLiked?: boolean, @Query('isDisliked', new DefaultValuePipe(false), ParseBoolPipe) isDisliked?: boolean, - @Query('isUpcomingTitle', new DefaultValuePipe(false), ParseBoolPipe) - isUpcomingTitle?: boolean, @Query('orderByKey') orderByKey?: keyof PostEntity, @Query('order') order?: 'ASC' | 'DESC', ) { @@ -231,7 +229,6 @@ export class PostController { req.user && req.user.id, isLiked, isDisliked, - isUpcomingTitle, orderByKey, order, ); diff --git a/ludos/backend/src/dtos/post/request/create.dto.ts b/ludos/backend/src/dtos/post/request/create.dto.ts index 5f6a6e09..e9d47ea4 100644 --- a/ludos/backend/src/dtos/post/request/create.dto.ts +++ b/ludos/backend/src/dtos/post/request/create.dto.ts @@ -1,6 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; import { IsArray, IsOptional, IsString, IsUUID } from 'class-validator'; -import { UpcomingTitleDto } from '../upcomingTitle.dto'; export class PostCreateDto { @ApiProperty({ @@ -48,10 +47,4 @@ export class PostCreateDto { @IsArray() @IsOptional() tags: string[]; - - - @ApiProperty({ - description: 'Upcoming Title', - }) - upcomingTitle: UpcomingTitleDto; } diff --git a/ludos/backend/src/dtos/post/request/update.dto.ts b/ludos/backend/src/dtos/post/request/update.dto.ts index 5e2ce3d2..6f39b6b0 100644 --- a/ludos/backend/src/dtos/post/request/update.dto.ts +++ b/ludos/backend/src/dtos/post/request/update.dto.ts @@ -1,6 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; import { IsArray, IsOptional, IsString, IsUUID } from 'class-validator'; -import { UpcomingTitleDto } from '../upcomingTitle.dto'; export class PostUpdateDto { @ApiProperty({ @@ -40,11 +39,4 @@ export class PostUpdateDto { @IsArray() @IsOptional() tags: string[]; - - @ApiProperty({ - description: 'Upcoming Title', - required: false, - }) - @IsOptional() - upcomingTitle: UpcomingTitleDto; } diff --git a/ludos/backend/src/dtos/post/response/create.response.dto.ts b/ludos/backend/src/dtos/post/response/create.response.dto.ts index 3d376430..ef003ede 100644 --- a/ludos/backend/src/dtos/post/response/create.response.dto.ts +++ b/ludos/backend/src/dtos/post/response/create.response.dto.ts @@ -1,6 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; import { Expose } from 'class-transformer'; -import { UpcomingTitleDto } from '../upcomingTitle.dto'; export class PostCreateResponseDto { @ApiProperty() @@ -26,8 +25,4 @@ export class PostCreateResponseDto { @ApiProperty() @Expose() createdAt: Date; - - @Expose() - @ApiProperty() - upcomingTitle: UpcomingTitleDto; } diff --git a/ludos/backend/src/dtos/post/response/get.response.dto.ts b/ludos/backend/src/dtos/post/response/get.response.dto.ts index 5867a260..35276d6b 100644 --- a/ludos/backend/src/dtos/post/response/get.response.dto.ts +++ b/ludos/backend/src/dtos/post/response/get.response.dto.ts @@ -3,7 +3,6 @@ import { Expose, Type } from 'class-transformer'; import { UserInOtherResponsesDto } from '../../user/response/user-in-other-responses.dto'; import { GameGetResponseDto } from '../../game/response/get.response'; import { GroupGetResponseDto } from '../../group/response/get.response.dto'; -import { UpcomingTitleDto } from '../upcomingTitle.dto'; export class PostGetResponseDto { @ApiProperty() @@ -69,8 +68,4 @@ export class PostGetResponseDto { @ApiProperty() @Expose() createdAt: Date; - - @ApiProperty() - @Expose() - upcomingTitle: UpcomingTitleDto; } diff --git a/ludos/backend/src/dtos/post/response/list.response.dto.ts b/ludos/backend/src/dtos/post/response/list.response.dto.ts index a417b7d6..da171281 100644 --- a/ludos/backend/src/dtos/post/response/list.response.dto.ts +++ b/ludos/backend/src/dtos/post/response/list.response.dto.ts @@ -3,7 +3,6 @@ import { Expose, Type } from 'class-transformer'; import { UserInOtherResponsesDto } from '../../user/response/user-in-other-responses.dto'; import { GameGetResponseDto } from '../../game/response/get.response'; import { GroupGetResponseDto } from '../../group/response/get.response.dto'; -import { UpcomingTitleDto } from '../upcomingTitle.dto'; export class PostListResponseDto { @Expose() @@ -50,8 +49,4 @@ export class PostListResponseDto { @Expose() @ApiProperty() isDisliked: boolean; - - @Expose() - @ApiProperty() - upcomingTitle: UpcomingTitleDto; } diff --git a/ludos/backend/src/dtos/post/upcomingTitle.dto.ts b/ludos/backend/src/dtos/post/upcomingTitle.dto.ts deleted file mode 100644 index f4b4a76d..00000000 --- a/ludos/backend/src/dtos/post/upcomingTitle.dto.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { IsBoolean, IsDate, IsString } from 'class-validator'; - -export class UpcomingTitleDto { - @IsBoolean() - isUpcomingTitle: boolean; - - @IsDate() - launchingDate: Date; - - @IsString() - demoLink: string; -} \ No newline at end of file diff --git a/ludos/backend/src/entities/post.entity.ts b/ludos/backend/src/entities/post.entity.ts index 63bfb1cc..9dff02a9 100644 --- a/ludos/backend/src/entities/post.entity.ts +++ b/ludos/backend/src/entities/post.entity.ts @@ -12,7 +12,6 @@ import { import { User } from './user.entity'; import { Game } from './game.entity'; import { Group } from './group.entity'; -import { UpcomingTitleDto } from '../dtos/post/upcomingTitle.dto'; @Entity('posts') export class Post { @@ -76,7 +75,4 @@ export class Post { isLiked: boolean; isDisliked: boolean; - - @Column('jsonb') - upcomingTitle: UpcomingTitleDto; } diff --git a/ludos/backend/src/repositories/post.repository.ts b/ludos/backend/src/repositories/post.repository.ts index 21c772bd..fe2d35a9 100644 --- a/ludos/backend/src/repositories/post.repository.ts +++ b/ludos/backend/src/repositories/post.repository.ts @@ -60,7 +60,6 @@ export class PostRepository extends Repository { userId?: string, // denotes current user, used for like and dislike isLiked?: boolean, isDisliked?: boolean, - isUpcomingTitle?: boolean, orderByKey: keyof Post = 'createdAt', order: 'ASC' | 'DESC' = 'DESC', ): Promise> { @@ -89,12 +88,6 @@ export class PostRepository extends Repository { if (ownerUserId) { queryBuilder.andWhere('posts.userId = :ownerUserId', { ownerUserId }); } - if (isUpcomingTitle) { - console.log("seeeennnn"); - queryBuilder.andWhere('posts."upcomingTitle"->>\'isUpcomingTitle\' = :isUpcomingTitle', { - isUpcomingTitle: isUpcomingTitle.toString(), - }); - } if (userId && isLiked) { const subQuery = this.createQueryBuilder() .select('1') diff --git a/ludos/backend/src/services/post.service.ts b/ludos/backend/src/services/post.service.ts index fdc97692..f7270046 100644 --- a/ludos/backend/src/services/post.service.ts +++ b/ludos/backend/src/services/post.service.ts @@ -158,7 +158,6 @@ export class PostService { userId?: string, isLiked?: boolean, isDisliked?: boolean, - isUpcomingTitle?: boolean, orderByKey?: keyof Post, order?: 'ASC' | 'DESC', ): Promise> { @@ -183,7 +182,6 @@ export class PostService { userId, isLiked, isDisliked, - isUpcomingTitle, orderByKey, order, );