Merge branch '0.3' into #22

Reviewed-on: sh-edraft.de/kd_discord_bot#141
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #140

kdb-bot/src/bot/bot.json

@@ -16,22 +16,22 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.10.0.post9",
+      "cpl-core==2022.12.0",
       "cpl-translation==2022.10.0.post2",
-      "cpl-query==2022.10.0.post2",
-      "cpl-discord==2022.10.0.post6",
+      "cpl-query==2022.12.2",
+      "cpl-discord==2022.12.0",
       "Flask==2.2.2",
       "Flask-Classful==0.14.2",
       "Flask-Cors==3.0.10",
       "PyJWT==2.6.0",
       "waitress==2.1.2",
-      "Flask-SocketIO==5.3.1",
-      "eventlet==0.33.1",
+      "Flask-SocketIO==5.3.2",
+      "eventlet==0.33.2",
       "requests-oauthlib==1.3.1",
       "icmplib==3.0.3"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_api/bot-api.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core==2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_api/controller/auth_controller.py

@@ -46,14 +46,14 @@ class AuthController:
     @Route.authorize(role=AuthRoleEnum.admin)
     async def get_all_users(self) -> Response:
         result = await self._auth_service.get_all_auth_users_async()
-        return jsonify(result.select(lambda x: x.to_dict()))
+        return jsonify(result.select(lambda x: x.to_dict()).to_list())
 
     @Route.post(f'{BasePath}/users/get/filtered')
     @Route.authorize(role=AuthRoleEnum.admin)
     async def get_filtered_users(self) -> Response:
         dto: AuthUserSelectCriteria = JSONProcessor.process(AuthUserSelectCriteria, request.get_json(force=True, silent=True))
         result = await self._auth_service.get_filtered_auth_users_async(dto)
-        result.result = result.result.select(lambda x: x.to_dict())
+        result.result = result.result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result.to_dict())
 
     @Route.get(f'{BasePath}/users/get/<email>')

kdb-bot/src/bot_api/controller/discord/server_controller.py

@@ -40,14 +40,14 @@ class ServerController:
     @Route.authorize(role=AuthRoleEnum.admin)
     async def get_all_servers(self) -> Response:
         result = await self._discord_service.get_all_servers()
-        result = result.select(lambda x: x.to_dict())
+        result = result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result)
 
     @Route.get(f'{BasePath}/get/servers-by-user')
     @Route.authorize
     async def get_all_servers_by_user(self) -> Response:
         result = await self._discord_service.get_all_servers_by_user()
-        result = result.select(lambda x: x.to_dict())
+        result = result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result)
 
     @Route.post(f'{BasePath}/get/filtered')
@@ -55,11 +55,11 @@ class ServerController:
     async def get_filtered_servers(self) -> Response:
         dto: ServerSelectCriteria = JSONProcessor.process(ServerSelectCriteria, request.get_json(force=True, silent=True))
         result = await self._discord_service.get_filtered_servers_async(dto)
-        result.result = result.result.select(lambda x: x.to_dict())
+        result.result = result.result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result.to_dict())
 
     @Route.get(f'{BasePath}/get/<id>')
     @Route.authorize
     async def get_server_by_id(self, id: int) -> Response:
-        result = await self._discord_service.get_server_by_id_async(id)
+        result = await self._discord_service.get_server_by_id_async(id).to_list()
         return jsonify(result.to_dict())

kdb-bot/src/bot_core/bot-core.json

@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=0.3.dev70"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_data/bot-data.json

@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=0.3.dev70"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/auto_role/auto-role.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post5"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/base/base.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post2"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/boot_log/boot-log.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post2"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/database/database.json

@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post2"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/level/level.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=2022.10.1"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/level/level_seeder.py

@@ -88,7 +88,7 @@ class LevelSeeder(DataSeederABC):
                 if levels.where(lambda l: l.name == role.name).count() == 0:
                     continue
 
-                new_position = position_above_levels - (levels.index(levels.where(lambda l: l.name == role.name).single()) + 1)
+                new_position = position_above_levels - (levels.index_of(levels.where(lambda l: l.name == role.name).single()) + 1)
                 if new_position <= 0:
                     new_position = 1
                 try:

kdb-bot/src/modules/permission/permission.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post2"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/stats/stats.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=2022.10.1"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/technician/technician.json

@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.6",
     "PythonPath": {},

kdb-bot/tools/get_version/get-version.json

@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/tools/post_build/post-build.json

@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/tools/set_version/set-version.json

@@ -16,11 +16,11 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.10.0.post7",
+      "cpl-core==2022.12.0"
       "GitPython==3.1.27"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-web/src/app/modules/view/server/members/members-routing.module.ts

@@ -1,13 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-import { MembersComponent } from "./component/members/members.component";
-
-const routes: Routes = [
-  { path: '', component: MembersComponent },
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class MembersRoutingModule { }

kdb-web/src/app/modules/view/server/server-routing.module.ts

@@ -1,11 +1,9 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { ServerDashboardComponent } from './server-dashboard/server-dashboard.component';
-import { AuthGuard } from "../../shared/guards/auth/auth.guard";
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+import { ServerDashboardComponent } from "./server-dashboard/server-dashboard.component";
 
 const routes: Routes = [
   { path: '', component: ServerDashboardComponent },
-  { path: 'members', loadChildren: () => import('./members/members.module').then(m => m.MembersModule), canActivate: [AuthGuard] },
 ];
 
 @NgModule({