Merge pull request #42 from Kites-Foundation/develop

changes for ids

src/app.module.ts

@@ -9,7 +9,6 @@ import { MailerModule } from '@nestjs-modules/mailer';
 import { nestMailer } from './config/constants';
 import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
 import { ReviewsModule } from './reviews/reviews.module';
-import { RoleModule } from './role/role.module';
 
 @Module({
   imports: [
@@ -44,7 +43,6 @@ import { RoleModule } from './role/role.module';
     watchmanModule,
     AuthModule,
     ReviewsModule,
-    RoleModule,
   ],
   controllers: [],
   providers: [

src/auth/entities/users.entity.ts

@@ -8,7 +8,6 @@ import {
   JoinColumn,
 } from 'typeorm';
 import { Review } from '../../reviews/entities/reviews.entity';
-import { Role } from '../../role/entities/role.entity';
 
 @Entity('users')
 @Unique(['email'])
@@ -17,6 +16,10 @@ export default class Users {
   id: number;
   @Column()
   name: string;
+
+  @Column()
+  role: string;
+
   @Column()
   userName: string;
   @Column()
@@ -53,10 +56,4 @@ export default class Users {
   })
   @JoinColumn({ name: 'id', referencedColumnName: 'userId' })
   reviewUser: Review[];
-
-  @OneToMany((type) => Role, (role) => role.user, {
-    cascade: ['update'],
-  })
-  @JoinColumn({ name: 'id' })
-  role: Role[];
 }

src/reviews/dto/create-review.dto.ts

@@ -12,25 +12,25 @@ export class CreateReviewDto {
     example: '123',
     description: 'Destination Id',
   })
-  destinationId: number;
+  destinationId: string;
 
   @ApiProperty({
     example: '123',
     description: 'Destination Id',
   })
   @IsOptional()
-  facilityId: number;
+  facilityId: string;
 
   @ApiProperty({
     example: '123',
     description: 'Destination Id',
   })
   @IsOptional()
-  activityId: number;
+  activityId: string;
 
   @ApiProperty({ example: '123' })
   @IsOptional()
-  typeId: number;
+  typeId: string;
 
 
   @ApiProperty({

src/reviews/dto/review-filter.dto.ts

@@ -8,19 +8,19 @@ export class ReviewFilterDto {
 
   @ApiProperty({ example: null , required: false})
   @IsOptional()
-  destinationId: number;
+  destinationId: string;
 
   @ApiProperty({ example: null, required: false })
   @IsOptional()
-  facilityId: number;
+  facilityId: string;
 
   @ApiProperty({ example: null, required: false })
   @IsOptional()
-  activityId: number;
+  activityId: string;
 
   @ApiProperty({ example: null , required: false})
   @IsOptional()
-  typeId: number;
+  typeId: string;
 
   @ApiProperty({ example: null , required: false})
   @IsOptional()

src/reviews/entities/reviews.entity.ts

@@ -16,13 +16,13 @@ export class Review {
   userId: number;
 
   @Column({ nullable: true })
-  destinationId: number;
+  destinationId: string;
 
   @Column({ nullable: true })
-  activityId: number;
+  activityId: string;
 
   @Column({ nullable: true })
-  facilityId: number;
+  facilityId: string;
 
   @Column()
   title: string;
@@ -34,7 +34,7 @@ export class Review {
   date: Date;
 
   @Column({nullable: true})
-  typeId: number;
+  typeId: string;
 
   @Column()
   status: string;

src/reviews/migrations/1613742533820-reviews.ts

@@ -25,17 +25,17 @@ export class reviews1613742533820 implements MigrationInterface {
           },
           {
             name: 'destinationId',
-            type: 'bigint',
+            type: 'varchar',
             isNullable: true,
           },
           {
             name: 'facilityId',
-            type: 'bigint',
+            type: 'varchar',
             isNullable: true,
           },
           {
             name: 'activityId',
-            type: 'bigint',
+            type: 'varchar',
             isNullable: true,
           },
           {

src/reviews/migrations/1613807846847-alterReview.ts

@@ -5,7 +5,7 @@ export class alterReview1613807846847 implements MigrationInterface {
     public async up(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.addColumn('reviews', new TableColumn({
             name: 'typeId',
-            type: 'bigint',
+            type: 'varchar',
             isNullable: true
         }));
     }

src/reviews/review.repository.ts

@@ -23,8 +23,7 @@ export class ReviewRepository extends Repository<Review> {
     const query = this.createQueryBuilder('reviews');
     query
       .leftJoin('reviews.user', 'user')
-        .leftJoin('user.role', 'roles')
-      .select(['reviews', 'reviews.user','user.email','user.googleImageUrl' ,'user.id', 'roles.id', 'roles.role'])
+      .select(['reviews', 'reviews.user','user.email','user.googleImageUrl' ,'user.id', 'user.role'])
       .orderBy('reviews.date', 'DESC');
 
     if (userId) {
@@ -83,6 +82,7 @@ export class ReviewRepository extends Repository<Review> {
       title,
       rating,
       status,
+        facilityId
     } = createReviewDto;
     const review = new Review();
 
@@ -92,6 +92,7 @@ export class ReviewRepository extends Repository<Review> {
     review.typeId = typeId;
     review.activityId = activityId;
     review.userId = userId;
+    review.facilityId = facilityId;
     review.title = title;
     review.rating = rating;
     review.status = status;

src/reviews/reviews.controller.ts

@@ -1,5 +1,5 @@
 import {
-  Body,
+  Body, CacheInterceptor,
   Controller,
   Delete,
   Get,
@@ -9,14 +9,15 @@ import {
   Put, Query,
   Req,
   Request,
-  UseGuards,
+  UseGuards, UseInterceptors,
 } from "@nestjs/common";
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { ReviewsService } from './reviews.service';
 import { CreateReviewDto, ReviewFilterDto } from './dto';
 import { AuthGuard } from '@nestjs/passport';
 import { Review } from './entities/reviews.entity';
 
+
 @ApiBearerAuth()
 @UseGuards(AuthGuard('jwt'))
 @ApiTags('Reviews')
@@ -25,19 +26,21 @@ export class ReviewsController {
   private logger = new Logger('Review Controller');
   constructor(private reviewService: ReviewsService) {}
 
+  @UseInterceptors(CacheInterceptor)
   @Get('reviews-stats')
   getStats(@Req() req: any): Promise<any> {
     const userId = req.user.id;
-    this.logger.verbose('Api Triggered', req.user.email);
+    this.logger.verbose('reviews-stats Api Triggered', req.user.email);
     return this.reviewService.getStats(userId);
   }
 
+  @UseInterceptors(CacheInterceptor)
   @Get('all-reviews')
   getAllReviews(
     @Query() reviewFilterDto: ReviewFilterDto,
     @Req() req: any,
   ): Promise<any> {
-    this.logger.verbose('Api Triggered', req.user.email);
+    this.logger.verbose('all-reviews Api Triggered', req.user.email);
     return this.reviewService.getAllReviews(reviewFilterDto);
   }
 
@@ -48,13 +51,13 @@ export class ReviewsController {
   ): Promise<Review> {
     createReviewDto.status = 'pending';
     createReviewDto.userId = req.user.id;
-    this.logger.verbose('Api Triggered', req.user.email);
+    this.logger.verbose('create-review Api Triggered', req.user.email);
     return this.reviewService.createReview(createReviewDto);
   }
 
   @Get('get-review/:id')
   getReviewById(@Param('id') id: number, @Req() req: any): Promise<Review> {
-    this.logger.verbose('Api Triggered', req.user.email);
+    this.logger.verbose('get-review/:id Api Triggered', req.user.email);
     return this.reviewService.getReviewById(id);
   }
 
@@ -64,13 +67,13 @@ export class ReviewsController {
     @Body('status') status: string,
     @Request() req: any,
   ) {
-    this.logger.verbose('Api Triggered', req.user.email);
+    this.logger.verbose('update-status/:id Api Triggered', req.user.email);
     return this.reviewService.updateReviewStatus(id, status, req);
   }
 
   @Delete('delete/:id')
-  destroyReview(@Request() req: any, @Param('id') id: number) {
-    this.logger.verbose('Api Triggered', req.user.email);
+  async destroyReview(@Request() req: any, @Param('id') id: number) {
+    this.logger.verbose('delete/:id Api Triggered', req.user.email);
     this.logger.verbose(`Review with ${id} deleted`);
     return this.reviewService.deleteReview(id);
   }

src/reviews/reviews.module.ts

@@ -1,14 +1,21 @@
-import { Module } from '@nestjs/common';
+import { CacheModule, Module } from "@nestjs/common";
 import { ReviewsService } from './reviews.service';
 import { ReviewsController } from './reviews.controller';
 import { Review } from './entities/reviews.entity';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import Users from '../auth/entities/users.entity';
 import { UserRepository } from '../auth/user.repository';
 import { ReviewRepository } from './review.repository';
+import * as redisStore from 'cache-manager-redis-store';
+
 
 @Module({
   imports: [
+    CacheModule.register({
+      store: redisStore,
+      host: process.env.X_REDIS_HOST,
+      port: process.env.X_REDIS_PORT,
+    }),
     TypeOrmModule.forFeature([Users, UserRepository]),
     TypeOrmModule.forFeature([Review, ReviewRepository]),
   ],