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.

Sign up for GitHub

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

Jump to bottom

Replaced user with user-entity in session-user #567

Merged
merged 3 commits into from
Aug 14, 2024
Merged

Replaced user with user-entity in session-user #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
542a81d
Replaced user with user-entity in session-user
leoseg Aug 1, 2024
4c572c3
Merge branch 'develop' into chore(maintenance)/-Replace-requser]-with…
kyleecodes Aug 12, 2024
6dd7cac
Merge branch 'develop' into chore(maintenance)/-Replace-requser]-with…
annarhughes Aug 14, 2024
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
8 changes: 4 additions & 4 deletions src/session-user/session-user.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
import { Request } from 'express';
import { GetUserDto } from 'src/user/dtos/get-user.dto';
import {UserEntity} from '../entities/user.entity';
import { ControllerDecorator } from 'src/utils/controller.decorator';
import { FirebaseAuthGuard } from '../firebase/firebase-auth.guard';
import { UpdateSessionUserDto } from './dtos/update-session-user.dto';
Expand All @@ -22,7 +22,7 @@ export class SessionUserController {
@UseGuards(FirebaseAuthGuard)
async createSessionUser(@Req() req: Request, @Body() createSessionUserDto: UpdateSessionUserDto) {
return await this.sessionUserService.createSessionUser(
req['user'] as GetUserDto,
req['userEntity'] as UserEntity,
createSessionUserDto,
);
}
Expand All @@ -35,7 +35,7 @@ export class SessionUserController {
@UseGuards(FirebaseAuthGuard)
async complete(@Req() req: Request, @Body() updateSessionUserDto: UpdateSessionUserDto) {
return await this.sessionUserService.setSessionUserCompleted(
req['user'] as GetUserDto,
req['userEntity'] as UserEntity,
updateSessionUserDto,
true,
);
Expand All @@ -50,7 +50,7 @@ export class SessionUserController {
@UseGuards(FirebaseAuthGuard)
async incomplete(@Req() req: Request, @Body() updateSessionUserDto: UpdateSessionUserDto) {
return await this.sessionUserService.setSessionUserCompleted(
req['user'] as GetUserDto,
req['userEntity'] as UserEntity,
updateSessionUserDto,
false,
);
Expand Down
5 changes: 2 additions & 3 deletions src/session-user/session-user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { CourseEntity } from '../entities/course.entity';
import { SessionUserEntity } from '../entities/session-user.entity';
import { Logger } from '../logger/logger';
import { SessionService } from '../session/session.service';
import { GetUserDto } from '../user/dtos/get-user.dto';
import { STORYBLOK_STORY_STATUS_ENUM } from '../utils/constants';
import { formatCourseUserObject, formatCourseUserObjects } from '../utils/serialize';
import { SessionUserDto } from './dtos/session-user.dto';
Expand Down Expand Up @@ -86,7 +85,7 @@ export class SessionUserService {
});
}

public async createSessionUser({ user }: GetUserDto, { storyblokId }: UpdateSessionUserDto) {
public async createSessionUser(user: UserEntity, { storyblokId }: UpdateSessionUserDto) {
const session = await this.sessionService.getSessionByStoryblokId(storyblokId);

if (!session) {
Expand Down Expand Up @@ -132,7 +131,7 @@ export class SessionUserService {
}

public async setSessionUserCompleted(
{ user }: GetUserDto,
user : UserEntity,
{ storyblokId }: UpdateSessionUserDto,
completed: boolean,
) {
Expand Down
Loading