Skip to content

Commit 1528fbc

Browse files
lambeolinokyleecodesannarhughes
authored
Replaced user with user-entity in session-user (chaynHQ#567)
Replaced req['user'] with req['userEntity'] in controller and changed type from GetUserDto to userEntity in controller and service Co-authored-by: Kylee Fields <43586156+kyleecodes@users.noreply.github.com> Co-authored-by: Anna Hughes <annaraehughes@live.co.uk>
1 parent fc31d6d commit 1528fbc

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/session-user/session-user.controller.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
22
import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
33
import { Request } from 'express';
4-
import { GetUserDto } from 'src/user/dtos/get-user.dto';
4+
import {UserEntity} from '../entities/user.entity';
55
import { ControllerDecorator } from 'src/utils/controller.decorator';
66
import { FirebaseAuthGuard } from '../firebase/firebase-auth.guard';
77
import { UpdateSessionUserDto } from './dtos/update-session-user.dto';
@@ -22,7 +22,7 @@ export class SessionUserController {
2222
@UseGuards(FirebaseAuthGuard)
2323
async createSessionUser(@Req() req: Request, @Body() createSessionUserDto: UpdateSessionUserDto) {
2424
return await this.sessionUserService.createSessionUser(
25-
req['user'] as GetUserDto,
25+
req['userEntity'] as UserEntity,
2626
createSessionUserDto,
2727
);
2828
}
@@ -35,7 +35,7 @@ export class SessionUserController {
3535
@UseGuards(FirebaseAuthGuard)
3636
async complete(@Req() req: Request, @Body() updateSessionUserDto: UpdateSessionUserDto) {
3737
return await this.sessionUserService.setSessionUserCompleted(
38-
req['user'] as GetUserDto,
38+
req['userEntity'] as UserEntity,
3939
updateSessionUserDto,
4040
true,
4141
);
@@ -50,7 +50,7 @@ export class SessionUserController {
5050
@UseGuards(FirebaseAuthGuard)
5151
async incomplete(@Req() req: Request, @Body() updateSessionUserDto: UpdateSessionUserDto) {
5252
return await this.sessionUserService.setSessionUserCompleted(
53-
req['user'] as GetUserDto,
53+
req['userEntity'] as UserEntity,
5454
updateSessionUserDto,
5555
false,
5656
);

src/session-user/session-user.service.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { CourseEntity } from '../entities/course.entity';
1010
import { SessionUserEntity } from '../entities/session-user.entity';
1111
import { Logger } from '../logger/logger';
1212
import { SessionService } from '../session/session.service';
13-
import { GetUserDto } from '../user/dtos/get-user.dto';
1413
import { STORYBLOK_STORY_STATUS_ENUM } from '../utils/constants';
1514
import { formatCourseUserObject, formatCourseUserObjects } from '../utils/serialize';
1615
import { SessionUserDto } from './dtos/session-user.dto';
@@ -86,7 +85,7 @@ export class SessionUserService {
8685
});
8786
}
8887

89-
public async createSessionUser({ user }: GetUserDto, { storyblokId }: UpdateSessionUserDto) {
88+
public async createSessionUser(user: UserEntity, { storyblokId }: UpdateSessionUserDto) {
9089
const session = await this.sessionService.getSessionByStoryblokId(storyblokId);
9190

9291
if (!session) {
@@ -132,7 +131,7 @@ export class SessionUserService {
132131
}
133132

134133
public async setSessionUserCompleted(
135-
{ user }: GetUserDto,
134+
user : UserEntity,
136135
{ storyblokId }: UpdateSessionUserDto,
137136
completed: boolean,
138137
) {

0 commit comments

Comments
 (0)