Merge remote-tracking branch 'refs/remotes/origin/main' into feat/dep…

…loyment-frontend # Conflicts: # package-lock.json
kordis-leitstelle · Dec 29, 2024 · 1b1163f · 1b1163f
2 parents b007f03 + 64926b2
commit 1b1163f
Show file tree

Hide file tree

Showing 7 changed files with 7,328 additions and 5,659 deletions.
diff --git a/libs/api/protocol/src/lib/infra/repository/protocol-entry.repository.ts b/libs/api/protocol/src/lib/infra/repository/protocol-entry.repository.ts
@@ -35,21 +35,35 @@ export class ImplProtocolEntryRepository implements ProtocolEntryRepository {
 		direction: 'preceding' | 'subsequent',
 		startingFrom?: Date,
 	): Promise<ProtocolEntryBase[]> {
-		const query = this.getQueryForSubset(
+		const protocolEntries = await this.getQueryForSubset(
 			organizationId,
 			direction === 'preceding' ? 'asc' : 'desc',
 			startingFrom,
-		).limit(count);
-
-		const protocolEntries = await query.lean().exec();
+		)
+			.limit(count)
+			.lean<ProtocolEntryBaseDocument[]>()
+			.exec();
 
 		if (direction === 'preceding') {
 			protocolEntries.reverse();
 		}
 
-		return protocolEntries.map((entry) =>
-			this.mapper.map(entry as ProtocolEntryBaseDocument),
+		return protocolEntries.map((entry) => this.mapper.map(entry));
+	}
+
+	async hasProtocolEntries(
+		organizationId: string,
+		direction: 'preceding' | 'subsequent',
+		startingFrom?: Date,
+	): Promise<boolean> {
+		const query = this.getQueryForSubset(
+			organizationId,
+			direction === 'preceding' ? 'asc' : 'desc',
+			startingFrom,
 		);
+		const protocolEntry = await query.select('_id').findOne();
+
+		return protocolEntry !== null;
 	}
 
 	private getQueryForSubset(
@@ -68,19 +82,4 @@ export class ImplProtocolEntryRepository implements ProtocolEntryRepository {
 		}
 		return query;
 	}
-
-	async hasProtocolEntries(
-		organizationId: string,
-		direction: 'preceding' | 'subsequent',
-		startingFrom?: Date,
-	): Promise<boolean> {
-		const query = this.getQueryForSubset(
-			organizationId,
-			direction === 'preceding' ? 'asc' : 'desc',
-			startingFrom,
-		);
-		const protocolEntry = await query.select('_id').findOne();
-
-		return protocolEntry !== null;
-	}
 }
diff --git a/libs/api/protocol/src/lib/infra/schema/protocol-entry-base.schema.ts b/libs/api/protocol/src/lib/infra/schema/protocol-entry-base.schema.ts
@@ -59,7 +59,6 @@ producerPath.discriminator(ProducerType.USER_PRODUCER, UserProducerSchema);
 producerPath.discriminator(ProducerType.SYSTEM_PRODUCER, SystemProducerSchema);
 
 ProtocolEntryBaseSchema.index({ orgId: 1, time: 1 }, { unique: false });
-ProtocolEntryBaseSchema.index({ orgId: 1 }, { unique: false });
 
 @Schema()
 export class ProtocolMessageEntryBaseDocument extends ProtocolEntryBaseDocument {

diff --git a/libs/api/tetra/src/lib/infra/schema/tetra-config.schema.ts b/libs/api/tetra/src/lib/infra/schema/tetra-config.schema.ts
@@ -2,12 +2,10 @@ import { AutoMap } from '@automapper/classes';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 
-@Schema({ collection: 'tetra-configs' })
-export class TetraConfigDocument extends Document {
-	@Prop({ unique: true })
-	@AutoMap()
-	orgId: string;
+import { BaseDocument } from '@kordis/api/shared';
 
+@Schema({ collection: 'tetra-configs' })
+export class TetraConfigDocument extends BaseDocument {
 	@Prop()
 	@AutoMap()
 	tetraControlApiUrl: string;

diff --git a/libs/spa/core/graphql/src/lib/graphql.service.spec.ts b/libs/spa/core/graphql/src/lib/graphql.service.spec.ts
@@ -73,7 +73,6 @@ describe('GraphqlService', () => {
 	it('should call apollo.mutate and return the response', async () => {
 		const mutation = {} as DocumentNode;
 		const variables = {};
-		const optimisticResponse = { foo: 'bar' };
 		const response: MutationResult = {
 			loading: false,
 			data: { foo: 'bar' },
@@ -82,16 +81,12 @@ describe('GraphqlService', () => {
 		apolloMock.mutate.mockReturnValue(of(response));
 
 		const result = await firstValueFrom(
-			graphqlService.mutate$(mutation, variables, optimisticResponse),
+			graphqlService.mutate$(mutation, variables),
 		);
 
 		expect(apolloMock.mutate).toHaveBeenCalledWith({
 			mutation,
 			variables,
-			optimisticResponse: {
-				__typename: 'Mutation',
-				...optimisticResponse,
-			},
 		});
 		expect(result).toEqual({
 			foo: 'bar',

diff --git a/libs/spa/core/graphql/src/lib/graphql.service.ts b/libs/spa/core/graphql/src/lib/graphql.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { DocumentNode } from '@apollo/client/core';
+import { DocumentNode, Unmasked } from '@apollo/client/core';
 import { Apollo } from 'apollo-angular';
 import { Observable, map } from 'rxjs';
 
@@ -43,15 +43,11 @@ export class GraphqlService {
 	mutate$<TData = unknown>(
 		mutation: DocumentNode,
 		variables?: Record<string, unknown>,
-		optimisticResponse?: TData,
 	): Observable<TData> {
 		return this.apollo
 			.mutate<TData>({
 				mutation,
 				variables,
-				optimisticResponse: optimisticResponse
-					? { __typename: 'Mutation', ...optimisticResponse }
-					: undefined,
 			})
 			.pipe(map(({ data }) => data as TData));
 	}