Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "upcoming titles feature added" #801

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ludos/backend/src/controllers/post.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
) {
Expand All @@ -231,7 +229,6 @@ export class PostController {
req.user && req.user.id,
isLiked,
isDisliked,
isUpcomingTitle,
orderByKey,
order,
);
Expand Down
7 changes: 0 additions & 7 deletions ludos/backend/src/dtos/post/request/create.dto.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand Down Expand Up @@ -48,10 +47,4 @@ export class PostCreateDto {
@IsArray()
@IsOptional()
tags: string[];


@ApiProperty({
description: 'Upcoming Title',
})
upcomingTitle: UpcomingTitleDto;
}
8 changes: 0 additions & 8 deletions ludos/backend/src/dtos/post/request/update.dto.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand Down Expand Up @@ -40,11 +39,4 @@ export class PostUpdateDto {
@IsArray()
@IsOptional()
tags: string[];

@ApiProperty({
description: 'Upcoming Title',
required: false,
})
@IsOptional()
upcomingTitle: UpcomingTitleDto;
}
5 changes: 0 additions & 5 deletions ludos/backend/src/dtos/post/response/create.response.dto.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ApiProperty } from '@nestjs/swagger';
import { Expose } from 'class-transformer';
import { UpcomingTitleDto } from '../upcomingTitle.dto';

export class PostCreateResponseDto {
@ApiProperty()
Expand All @@ -26,8 +25,4 @@ export class PostCreateResponseDto {
@ApiProperty()
@Expose()
createdAt: Date;

@Expose()
@ApiProperty()
upcomingTitle: UpcomingTitleDto;
}
5 changes: 0 additions & 5 deletions ludos/backend/src/dtos/post/response/get.response.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -69,8 +68,4 @@ export class PostGetResponseDto {
@ApiProperty()
@Expose()
createdAt: Date;

@ApiProperty()
@Expose()
upcomingTitle: UpcomingTitleDto;
}
5 changes: 0 additions & 5 deletions ludos/backend/src/dtos/post/response/list.response.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -50,8 +49,4 @@ export class PostListResponseDto {
@Expose()
@ApiProperty()
isDisliked: boolean;

@Expose()
@ApiProperty()
upcomingTitle: UpcomingTitleDto;
}
12 changes: 0 additions & 12 deletions ludos/backend/src/dtos/post/upcomingTitle.dto.ts

This file was deleted.

4 changes: 0 additions & 4 deletions ludos/backend/src/entities/post.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -76,7 +75,4 @@ export class Post {
isLiked: boolean;

isDisliked: boolean;

@Column('jsonb')
upcomingTitle: UpcomingTitleDto;
}
7 changes: 0 additions & 7 deletions ludos/backend/src/repositories/post.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export class PostRepository extends Repository<Post> {
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<Pagination<Post, IPaginationMeta>> {
Expand Down Expand Up @@ -89,12 +88,6 @@ export class PostRepository extends Repository<Post> {
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')
Expand Down
2 changes: 0 additions & 2 deletions ludos/backend/src/services/post.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export class PostService {
userId?: string,
isLiked?: boolean,
isDisliked?: boolean,
isUpcomingTitle?: boolean,
orderByKey?: keyof Post,
order?: 'ASC' | 'DESC',
): Promise<Pagination<Post, IPaginationMeta>> {
Expand All @@ -183,7 +182,6 @@ export class PostService {
userId,
isLiked,
isDisliked,
isUpcomingTitle,
orderByKey,
order,
);
Expand Down
Loading