Merge branch 'main' into EW-570-review-comments

hpi-schul-cloud · Oct 24, 2023 · 82f065d · 82f065d
2 parents cf220b8 + 88c6f4e
commit 82f065d
Show file tree

Hide file tree

Showing 592 changed files with 7,486 additions and 8,799 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -83,8 +83,12 @@ jobs:
         run: |
           sudo apt-get install -y lcov
           find coverage -name *.info -exec echo -a {} \; | xargs lcov -o merged-lcov.info
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: SonarCloud upload coverage
-        uses: SonarSource/sonarcloud-github-action@v1.9
+        uses: SonarSource/sonarcloud-github-action@v2.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}

diff --git a/ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2 b/ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2
@@ -25,6 +25,9 @@ data:
     else
         echo "gg, hacky mongo replicaset"
     fi
+    {% if KEDA_NAMESPACE_ACTIVATOR_ENABLED is defined %}
+    curl -XPUT -H 'Content-Type: application/json'  -Lv 'https://activate.cd.dbildungscloud.dev/namespace' -d '{"name" : "{{ NAMESPACE }}"}'
+    {% endif %}
     curl --retry 360 --retry-connrefused --retry-delay 10 -X POST 'http://mgmt-svc:3333/api/management/database/seed?with-indexes=true'
 
     # Below is a series of a MongoDB-data initializations, meant for the development and testing

diff --git a/apps/server/src/apps/files-storage-consumer.app.ts b/apps/server/src/apps/files-storage-consumer.app.ts
@@ -3,7 +3,7 @@
 import { NestFactory } from '@nestjs/core';
 
 // register source-map-support for debugging
-import { FilesStorageAMQPModule } from '@src/modules/files-storage';
+import { FilesStorageAMQPModule } from '@modules/files-storage';
 import { install as sourceMapInstall } from 'source-map-support';
 
 async function bootstrap() {

diff --git a/apps/server/src/apps/files-storage.app.ts b/apps/server/src/apps/files-storage.app.ts
@@ -10,7 +10,7 @@ import { install as sourceMapInstall } from 'source-map-support';
 // application imports
 import { SwaggerDocumentOptions } from '@nestjs/swagger';
 import { LegacyLogger } from '@src/core/logger';
-import { API_VERSION_PATH, FilesStorageApiModule } from '@src/modules/files-storage';
+import { API_VERSION_PATH, FilesStorageApiModule } from '@modules/files-storage';
 import { enableOpenApiDocs } from '@src/shared/controller/swagger';
 
 async function bootstrap() {

diff --git a/apps/server/src/apps/fwu-learning-contents.app.ts b/apps/server/src/apps/fwu-learning-contents.app.ts
@@ -9,7 +9,7 @@ import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
 import { LegacyLogger } from '@src/core/logger';
-import { FwuLearningContentsModule } from '@src/modules/fwu-learning-contents';
+import { FwuLearningContentsModule } from '@modules/fwu-learning-contents';
 import { enableOpenApiDocs } from '@src/shared/controller/swagger';
 
 async function bootstrap() {

diff --git a/apps/server/src/apps/h5p-editor.app.ts b/apps/server/src/apps/h5p-editor.app.ts
@@ -9,7 +9,7 @@ import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
 import { LegacyLogger } from '@src/core/logger';
-import { H5PEditorModule } from '@src/modules/h5p-editor';
+import { H5PEditorModule } from '@modules/h5p-editor';
 import { enableOpenApiDocs } from '@src/shared/controller/swagger';
 
 async function bootstrap() {

diff --git a/apps/server/src/apps/management.app.ts b/apps/server/src/apps/management.app.ts
@@ -9,7 +9,7 @@ import { install as sourceMapInstall } from 'source-map-support';
 
 // application imports
 import { LegacyLogger } from '@src/core/logger';
-import { ManagementServerModule } from '@src/modules/management';
+import { ManagementServerModule } from '@modules/management';
 import { enableOpenApiDocs } from '@src/shared/controller/swagger';
 
 async function bootstrap() {

diff --git a/apps/server/src/apps/server.app.ts b/apps/server/src/apps/server.app.ts
@@ -7,20 +7,20 @@ import { ExpressAdapter } from '@nestjs/platform-express';
 import { enableOpenApiDocs } from '@shared/controller/swagger';
 import { Mail, MailService } from '@shared/infra/mail';
 import { LegacyLogger, Logger } from '@src/core/logger';
-import { AccountService } from '@src/modules/account/services/account.service';
-import { TeamService } from '@src/modules/teams/service/team.service';
-import { AccountValidationService } from '@src/modules/account/services/account.validation.service';
-import { AccountUc } from '@src/modules/account/uc/account.uc';
-import { CollaborativeStorageUc } from '@src/modules/collaborative-storage/uc/collaborative-storage.uc';
-import { GroupService } from '@src/modules/group';
-import { RocketChatService } from '@src/modules/rocketchat';
-import { ServerModule } from '@src/modules/server';
+import { AccountService } from '@modules/account/services/account.service';
+import { TeamService } from '@modules/teams/service/team.service';
+import { AccountValidationService } from '@modules/account/services/account.validation.service';
+import { AccountUc } from '@modules/account/uc/account.uc';
+import { CollaborativeStorageUc } from '@modules/collaborative-storage/uc/collaborative-storage.uc';
+import { GroupService } from '@modules/group';
+import { RocketChatService } from '@modules/rocketchat';
+import { ServerModule } from '@modules/server';
 import express from 'express';
 import { join } from 'path';
 
 // register source-map-support for debugging
 import { install as sourceMapInstall } from 'source-map-support';
-import { FeathersRosterService } from '@src/modules/pseudonym';
+import { FeathersRosterService } from '@modules/pseudonym';
 import legacyAppPromise = require('../../../../src/app');
 
 import { AppStartLoggable } from './helpers/app-start-loggable';

diff --git a/apps/server/src/console/api-test/test-bootstrap.console.ts b/apps/server/src/console/api-test/test-bootstrap.console.ts
@@ -1,7 +1,7 @@
 import { createMock } from '@golevelup/ts-jest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { ConsoleWriterService } from '@shared/infra/console';
-import { DatabaseManagementUc } from '@src/modules/management/uc/database-management.uc';
+import { DatabaseManagementUc } from '@modules/management/uc/database-management.uc';
 import { AbstractBootstrapConsole, BootstrapConsole } from 'nestjs-console';
 
 export class TestBootstrapConsole extends AbstractBootstrapConsole<TestingModule> {

diff --git a/apps/server/src/console/console.module.ts b/apps/server/src/console/console.module.ts
@@ -7,11 +7,11 @@ import { ALL_ENTITIES } from '@shared/domain';
 import { ConsoleWriterModule } from '@shared/infra/console/console-writer/console-writer.module';
 import { KeycloakModule } from '@shared/infra/identity-management/keycloak/keycloak.module';
 import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config';
-import { FilesModule } from '@src/modules/files';
-import { FileEntity } from '@src/modules/files/entity';
-import { FileRecord } from '@src/modules/files-storage/entity';
-import { ManagementModule } from '@src/modules/management/management.module';
-import { serverConfig } from '@src/modules/server';
+import { FilesModule } from '@modules/files';
+import { FileEntity } from '@modules/files/entity';
+import { FileRecord } from '@modules/files-storage/entity';
+import { ManagementModule } from '@modules/management/management.module';
+import { serverConfig } from '@modules/server';
 import { ConsoleModule } from 'nestjs-console';
 import { ServerConsole } from './server.console';
 

diff --git a/apps/server/src/modules/account/controller/account.controller.spec.ts b/apps/server/src/modules/account/controller/account.controller.spec.ts
@@ -0,0 +1,24 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { AccountController } from './account.controller';
+import { AccountUc } from '../uc/account.uc';
+
+describe('account.controller', () => {
+	let module: TestingModule;
+	let controller: AccountController;
+	beforeAll(async () => {
+		module = await Test.createTestingModule({
+			providers: [
+				AccountController,
+				{
+					provide: AccountUc,
+					useValue: {},
+				},
+			],
+		}).compile();
+		controller = module.get(AccountController);
+	});
+
+	it('should be defined', () => {
+		expect(controller).toBeDefined();
+	});
+});
diff --git a/apps/server/src/modules/account/controller/account.controller.ts b/apps/server/src/modules/account/controller/account.controller.ts
@@ -1,8 +1,8 @@
 import { Body, Controller, Delete, Get, Param, Patch, Query } from '@nestjs/common';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { Authenticate, CurrentUser } from '@src/modules/authentication/decorator/auth.decorator';
 import { EntityNotFoundError, ForbiddenOperationError, ValidationError } from '@shared/common';
 import { ICurrentUser } from '@src/modules/authentication';
-import { Authenticate, CurrentUser } from '@src/modules/authentication/decorator/auth.decorator';
 import { AccountUc } from '../uc/account.uc';
 import {
 	AccountByIdBodyParams,
@@ -33,8 +33,6 @@ export class AccountController {
 		@Query() query: AccountSearchQueryParams
 	): Promise<AccountSearchListResponse> {
 		return this.accountUc.searchAccounts(currentUser, query);
-
-		// TODO: mapping from domain to api dto should be a responsability of the controller (also every other function here)
 	}
 
 	@Get(':id')