Merge remote-tracking branch 'origin/main' into main

Author: jan-jagoda

packages/framework/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @o2s/framework
 
+## 1.5.1
+
+### Patch Changes
+
+- 7fdb9c9: added delete user with id method in users module
+
 ## 1.5.0
 
 ### Minor Changes

packages/framework/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@o2s/framework",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "private": false,
     "license": "MIT",
     "exports": {

packages/framework/src/modules/users/users.controller.ts

@@ -53,7 +53,13 @@ export class UserController {
 
     @Delete('/me')
     @Auth.Roles({ roles: [Auth.Constants.Roles.USER, Auth.Constants.Roles.ADMIN] })
-    deleteUser(@Headers() headers: AppHeaders) {
-        return this.userService.deleteUser(headers.authorization);
+    deleteCurrentUser(@Headers() headers: AppHeaders) {
+        return this.userService.deleteCurrentUser(headers.authorization);
+    }
+
+    @Delete(':id')
+    @Auth.Roles({ roles: [Auth.Constants.Roles.USER, Auth.Constants.Roles.ADMIN] })
+    deleteUser(@Param() params: Request.GetUserParams, @Headers() headers: AppHeaders) {
+        return this.userService.deleteUser(params, headers.authorization);
     }
 }

packages/framework/src/modules/users/users.service.ts

@@ -27,5 +27,6 @@ export abstract class UserService {
         options: Users.Request.GetCustomerParams,
         authorization?: string,
     ): Observable<Customer | undefined>;
-    abstract deleteUser(authorization?: string): Observable<void>;
+    abstract deleteCurrentUser(authorization?: string): Observable<void>;
+    abstract deleteUser(options: Users.Request.GetUserParams, authorization?: string): Observable<void>;
 }

packages/integrations/mocked/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @o2s/integrations.mocked
 
+## 1.5.1
+
+### Patch Changes
+
+- 7fdb9c9: added delete user with id method in users module
+- Updated dependencies [7fdb9c9]
+    - @o2s/framework@1.5.1
+
 ## 1.5.0
 
 ### Minor Changes

packages/integrations/mocked/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@o2s/integrations.mocked",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "private": false,
     "license": "MIT",
     "exports": {

packages/integrations/mocked/src/modules/users/users.service.ts

@@ -35,7 +35,11 @@ export class UserService implements Users.Service {
         return of(mapCustomer(options.id)).pipe(responseDelay());
     }
 
-    deleteUser(): Observable<void> {
+    deleteCurrentUser(): Observable<void> {
+        throw new NotImplementedException('Delete current user method not implemented');
+    }
+
+    deleteUser(_options: Users.Request.GetUserParams): Observable<void> {
         throw new NotImplementedException('Delete user method not implemented');
     }
 }