From 980ad1028cc860817bec83c493f6940b711ad7ac Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 10 Sep 2022 16:10:57 +0200 Subject: [PATCH] Feature/allow date range change for demo user (#1243) * Allow date range change * Update changelog --- CHANGELOG.md | 6 ++++++ apps/api/src/app/user/user.controller.ts | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d9f6714..742e3bdaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Fixed + +- Allowed the date range change for the demo user + ## 1.190.0 - 10.09.2022 ### Added diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts index aa7db57ed..80ac93067 100644 --- a/apps/api/src/app/user/user.controller.ts +++ b/apps/api/src/app/user/user.controller.ts @@ -22,6 +22,7 @@ import { JwtService } from '@nestjs/jwt'; import { AuthGuard } from '@nestjs/passport'; import { User as UserModel } from '@prisma/client'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; +import { size } from 'lodash'; import { UserItem } from './interfaces/user-item.interface'; import { UpdateUserSettingDto } from './update-user-setting.dto'; @@ -100,6 +101,12 @@ export class UserController { @UseGuards(AuthGuard('jwt')) public async updateUserSetting(@Body() data: UpdateUserSettingDto) { if ( + size(data) === 1 && + data.dateRange && + this.request.user.role === 'DEMO' + ) { + // Allow date range change for demo user + } else if ( !hasPermission( this.request.user.permissions, permissions.updateUserSettings