diff --git a/backend-api/src/share-url/share-url.controller.ts b/backend-api/src/share-url/share-url.controller.ts index 14eb139..52fa383 100644 --- a/backend-api/src/share-url/share-url.controller.ts +++ b/backend-api/src/share-url/share-url.controller.ts @@ -18,11 +18,10 @@ export class ShareUrlController { @UseGuards(JwtAuthGuard) @Post('share-off/:dashboardId') - checkShareUrlOff(@Req() req, @Param() params, @Body() body) { - const { userId } = body; + checkShareUrlOff(@Req() req, @Param() params, @Body() shareUrlOnDto: ShareUrlOnDto) { const { authorization } = req.headers; const { dashboardId } = params; - return this.shareUrlService.checkShareUrlOff( authorization, dashboardId, userId ) + return this.shareUrlService.checkShareUrlOff( authorization, dashboardId, shareUrlOnDto) } @Get('share-dashboard/:uuid') diff --git a/backend-api/src/share-url/share-url.service.ts b/backend-api/src/share-url/share-url.service.ts index c2e8157..b513a6b 100644 --- a/backend-api/src/share-url/share-url.service.ts +++ b/backend-api/src/share-url/share-url.service.ts @@ -41,8 +41,8 @@ export class ShareUrlService { } } - async checkShareUrlOff( accessToken:string, dashboardId: number, userId: string ){ - const findpass = await this.userRepository.findOne({ where: { userId: userId }}) + async checkShareUrlOff( accessToken:string, dashboardId: number, shareUrlOnDto: ShareUrlOnDto){ + const findpass = await this.userRepository.findOne({ where: { userId: shareUrlOnDto.userId }}) const findUser = await this.authService.checkAccess(accessToken, findpass.password); if(!findUser){ return 'not exist user' @@ -51,6 +51,7 @@ export class ShareUrlService { const findDashboardShare = await this.dashboardShareRepository.findOne({ where: { id: findDashboard.shareId }}) findDashboardShare.shareToken = null; findDashboardShare.shareYn = YesNo.NO; + findDashboardShare.endDate = null; await this.dashboardShareRepository.save(findDashboardShare) return { message: "success" } }