Merge pull request 'Bugfix: resolved missing relation' (#89) from bugfix/88-user_update into dev

Reviewed-on: #89
closes #88

.drone.yml

@@ -1,3 +1,24 @@
+---
+kind: pipeline
+name: tests:14.15.1-alpine3.12
+clone:
+  disable: true
+steps:
+  - name: checkout pr
+    image: alpine/git
+    commands:
+      - git clone $DRONE_REMOTE_URL .
+      - git checkout $DRONE_SOURCE_BRANCH
+      - mv .env.ci .env
+  - name: run tests
+    image: node:14.15.1-alpine3.12
+    commands:
+      - yarn
+      - yarn test:ci
+trigger:
+  event:
+    - pull_request
+
 ---
 kind: pipeline
 name: tests:node_latest
@@ -11,7 +32,7 @@ steps:
       - git checkout $DRONE_SOURCE_BRANCH
       - mv .env.ci .env
   - name: run tests
-    image: node:14.15.1-alpine3.12
+    image: node:latest
     commands:
       - yarn
       - yarn test:ci
@@ -49,7 +70,7 @@ steps:
     settings:
       branch: dev
       commit: true
-      commit_message: new license file version [CI SKIP]
+      commit_message: 📖New license file version [CI SKIP]
       author_email: bot@odit.services
       remote: git@git.odit.services:lfk/backend.git
       ssh_key:

src/controllers/UserController.ts

@@ -62,7 +62,7 @@ export class UserController {
 		}
 
 		user = await this.userRepository.save(user)
-		return new ResponseUser(await this.userRepository.findOne({ id: user.id }, { relations: ['permissions', 'groups'] }));
+		return new ResponseUser(await this.userRepository.findOne({ id: user.id }, { relations: ['permissions', 'groups', 'groups.permissions'] }));
 	}
 
 	@Put('/:id')
@@ -83,7 +83,7 @@ export class UserController {
 		}
 		await this.userRepository.save(await updateUser.update(oldUser));
 
-		return new ResponseUser(await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] }));
+		return new ResponseUser(await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups', 'groups.permissions'] }));
 	}
 
 	@Delete('/:id')
@@ -95,7 +95,7 @@ export class UserController {
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let user = await this.userRepository.findOne({ id: id });
 		if (!user) { return null; }
-		const responseUser = await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] });;
+		const responseUser = await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups', 'groups.permissions'] });;
 
 		const permissionControler = new PermissionController();
 		for (let permission of responseUser.permissions) {