[SPGO-64] add new table SportAreaList

package.json

@@ -33,6 +33,8 @@
     "@prisma/client": "^5.3.1",
     "@types/bcrypt": "^5.0.0",
     "@types/passport-jwt": "^3.0.9",
+    "amqp-connection-manager": "^4.1.14",
+    "amqplib": "^0.10.3",
     "bcrypt": "^5.1.1",
     "grpc_tools_node_protoc_ts": "^5.3.3",
     "nestjs-grpc-exceptions": "^0.2.1",

src/auth/auth.controller.spec.ts

@@ -11,15 +11,18 @@ describe('AuthController', () => {
     resetPassword: jest.fn(),
     register: jest.fn(),
     validateGoogle: jest.fn(),
+    updateUserSportArea: jest.fn(),
   };
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [AuthController],
-      providers: [{
-        provide: AuthService,
-        useValue: mockAuthService,
-      }]
+      providers: [
+        {
+          provide: AuthService,
+          useValue: mockAuthService,
+        },
+      ],
     }).compile();
 
     controller = module.get<AuthController>(AuthController);

src/auth/auth.controller.ts

@@ -18,6 +18,8 @@ import {
   ValidateOAuthRequest,
   RefreshTokenRequest,
   RefreshTokenResponse,
+  UpdateUserSportAreaResponse,
+  UpdateUserSportAreaRequest,
 } from './auth.pb';
 import { AuthService } from './auth.service';
 
@@ -66,4 +68,11 @@ export class AuthController {
   validateToken(request: ValidateTokenRequest): Promise<ValidateTokenResponse> {
     return this.authService.validateToken(request);
   }
+
+  @GrpcMethod('AuthService', 'UpdateUserSportArea')
+  updateUserSportArea(
+    request: UpdateUserSportAreaRequest,
+  ): Promise<UpdateUserSportAreaResponse> {
+    return this.authService.updateUserSportArea(request);
+  }
 }

src/auth/auth.module.ts

@@ -1,12 +1,16 @@
 import { Inject, Module } from '@nestjs/common';
 import { PrismaModule } from '../prisma/prisma.module';
 import { UserRepository } from '../repository/user.repository';
 import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { JwtModule, JwtService } from '@nestjs/jwt';
 import { AccessTokenStrategy } from './strategies/accessToken.strategy';
 import { ConfigService } from '@nestjs/config';
 import { BlacklistRepository } from 'src/repository/blacklist.repository';
+
+import { SportAreaListRepository } from 'src/repository/sportAreaList.repository';
+
+
 import { ClientsModule, Transport } from '@nestjs/microservices';
 
 @Module({
@@ -21,7 +25,8 @@
       }
     }
   }])],
-  providers: [AuthService, UserRepository, AccessTokenStrategy, ConfigService, BlacklistRepository],
+  providers: [AuthService, UserRepository, AccessTokenStrategy, ConfigService, BlacklistRepository,SportAreaListRepository,],
+
   controllers: [AuthController],
 })
-export class AuthModule { }
+export class AuthModule {}

src/auth/auth.pb.ts

@@ -4,6 +4,16 @@ import { Observable } from "rxjs";
 
 export const protobufPackage = "auth";
 
+export interface UpdateUserSportAreaRequest {
+  userId: string;
+  sportAreaId: string;
+}
+
+export interface UpdateUserSportAreaResponse {
+  userId: string;
+  sportAreaId: string;
+}
+
 export interface RegisterRequest {
   firstName: string;
   lastName: string;
@@ -112,6 +122,8 @@ export interface AuthServiceClient {
   validateToken(request: ValidateTokenRequest): Observable<ValidateTokenResponse>;
 
   forgotPassword(request: ForgotPasswordRequest): Observable<ForgotPasswordResponse>;
+
+  updateUserSportArea(request: UpdateUserSportAreaRequest): Observable<UpdateUserSportAreaResponse>;
 }
 
 export interface AuthServiceController {
@@ -140,6 +152,10 @@ export interface AuthServiceController {
   forgotPassword(
     request: ForgotPasswordRequest,
   ): Promise<ForgotPasswordResponse> | Observable<ForgotPasswordResponse> | ForgotPasswordResponse;
+
+  updateUserSportArea(
+    request: UpdateUserSportAreaRequest,
+  ): Promise<UpdateUserSportAreaResponse> | Observable<UpdateUserSportAreaResponse> | UpdateUserSportAreaResponse;
 }
 
 export function AuthServiceControllerMethods() {
@@ -153,6 +169,7 @@ export function AuthServiceControllerMethods() {
       "logout",
       "validateToken",
       "forgotPassword",
+      "updateUserSportArea",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

src/auth/auth.service.spec.ts

@@ -4,33 +4,39 @@
 import { ConfigService } from '@nestjs/config';
 import { UserRepository } from '../repository/user.repository';
 import { BlacklistRepository } from '../repository/blacklist.repository';
+import { SportAreaListRepository } from '../repository/sportAreaList.repository';
 describe('AuthService', () => {
   let service: AuthService;
   const mockJwtService = {
     sign: jest.fn(),
   };
   const mockBlacklistService = {
     insertToken: jest.fn(),
     check: jest.fn(),
   };
   const mockUserRepository = {
     getUserByEmail: jest.fn(),
-    updateRefreshToken: jest.fn()
-  }
+    updateRefreshToken: jest.fn(),
+  };
 
   const mockConfigService = {
     get: jest.fn(),
-  }
+  };
   const mockBlacklistRepository = {
     addOutdatedToken: jest.fn(),
-  }
+  };
+
+  const mockSportAreaListRepository = {
+    addSportArea: jest.fn(),
+  };
 
   const mockEmailService = {
     emit: jest.fn(),
-  }
+  };
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [AuthService,
+      providers: [
+        AuthService,
         {
           provide: JwtService,
           useValue: mockJwtService,
@@ -49,10 +55,14 @@
           provide: BlacklistRepository,
           useValue: mockBlacklistRepository,
         },
+        {
+          provide: SportAreaListRepository,
+          useValue: mockSportAreaListRepository,
+        },
         {
           provide: 'EMAIL_SERVICE',
           useValue: mockEmailService,
-        }
+        },
       ],
     }).compile();
 

src/auth/auth.service.ts

@@ -23,15 +23,19 @@
   // ValidateGoogleRequest,
   // ValidateGoogleResponse,
   ValidateOAuthRequest,
+  UpdateUserSportAreaRequest,
+  UpdateUserSportAreaResponse,
 } from './auth.pb';
 import { ClientProxy, RpcException } from '@nestjs/microservices';
 import { status } from '@grpc/grpc-js';
 import { $Enums, Prisma } from '@prisma/client';
 import { v4 as uuidv4 } from 'uuid';
 import { Role } from '@prisma/client';
 import { BlacklistRepository } from '../repository/blacklist.repository';
+import { SportAreaListRepository } from '../repository/sportAreaList.repository';
 import { JwtPayload } from './strategies/accessToken.strategy';
 import * as nodemailer from 'nodemailer';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class AuthService implements AuthServiceController {
@@ -40,8 +44,9 @@
     private blacklistRepo: BlacklistRepository,
     private jwtService: JwtService,
     private configService: ConfigService,
+    private sportAreaListRepo: SportAreaListRepository,
     @Inject('EMAIL_SERVICE') private client: ClientProxy,
-  ) { }
+  ) {}
 
   public async login(request: LoginRequest): Promise<LoginResponse> {
     try {
@@ -455,13 +460,10 @@
         `,
       };
 
-
-      this.client.emit('forgot-password', { 'mailOptions': mailOptions });
+      this.client.emit('forgot-password', { mailOptions: mailOptions });
       // await transporter.sendMail(mailOptions);
 
-      return { resetPasswordUrl: linkToResetPassword }
-
-
+      return { resetPasswordUrl: linkToResetPassword };
     } catch (err: any) {
       console.log(err);
       if (!(err instanceof RpcException)) {
@@ -473,4 +475,21 @@
       throw err;
     }
   }
+  public async updateUserSportArea(
+    request: UpdateUserSportAreaRequest,
+  ): Promise<UpdateUserSportAreaResponse> {
+    try {
+      const user = await this.sportAreaListRepo.addSportArea(request);
+      return request;
+    } catch (err: any) {
+      console.log(err);
+      if (!(err instanceof RpcException)) {
+        throw new RpcException({
+          code: status.INTERNAL,
+          message: 'internal server error cant add new sportarea to user',
+        });
+      }
+      throw err;
+    }
+  }
 }

src/database/migrations/20231022073203_add_sport_area_list/migration.sql

@@ -0,0 +1,11 @@
+-- CreateTable
+CREATE TABLE "SportArea" (
+    "SportAreaId" TEXT NOT NULL,
+    "userId" TEXT NOT NULL
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SportArea_SportAreaId_key" ON "SportArea"("SportAreaId");
+
+-- AddForeignKey
+ALTER TABLE "SportArea" ADD CONSTRAINT "SportArea_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

src/database/migrations/20231022074911_test/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "ooo" TEXT;

src/database/migrations/20231022075146_delete_test/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `ooo` on the `User` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "ooo";

src/database/schema.prisma

@@ -25,6 +25,13 @@ model User {
   status       Status   @default(ACTIVE)
   googleID     String?  @unique
   facebookID   String?  @unique
+  sportArea    SportArea[]
+}
+
+model SportArea {
+  SportAreaId     String     @unique
+  userId          String
+  user            User       @relation(fields: [userId], references: [id])
 }
 
 enum Role {

src/proto/auth.proto

@@ -12,8 +12,20 @@ service AuthService {
   rpc Logout(LogoutRequest) returns (LogoutResponse) {}
   rpc ValidateToken(ValidateTokenRequest) returns (ValidateTokenResponse) {}
   rpc ForgotPassword(ForgotPasswordRequest) returns (ForgotPasswordResponse) {}
+  rpc UpdateUserSportArea(UpdateUserSportAreaRequest) returns (UpdateUserSportAreaResponse){}
 }
 
+
+message UpdateUserSportAreaRequest{
+  string userId = 1;
+  string sportAreaId=2;
+}
+
+message UpdateUserSportAreaResponse{
+  string userId = 1;
+  string sportAreaId=2;
+
+}
 message RegisterRequest {
   string firstName =1;
   string lastName =2;

src/repository/sportAreaList.repository.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaClient, Status, SportArea } from '@prisma/client';
+import { PrismaService } from '../prisma/service/prisma.service';
+import { Prisma } from '@prisma/client';
+import { UpdateUserSportAreaRequest } from 'src/auth/auth.pb';
+import { UserRepository } from './user.repository';
+
+@Injectable()
+export class SportAreaListRepository {
+  constructor(private db: PrismaService) {}
+
+  async addSportArea(
+    updateInfo: UpdateUserSportAreaRequest,
+  ): Promise<SportArea> {
+    return await this.db.sportArea.create({
+      data: {
+        SportAreaId: updateInfo.sportAreaId,
+        user: { connect: { id: updateInfo.userId } },
+      },
+    });
+  }
+}