tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix: strange merge conflict

Browse source
This commit is contained in:
Adriaan Jacquet 2025-04-06 22:41:25 +02:00
commit aa1de9bfa3
12 changed files with 64 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/src/services/service-helper.ts
View file

@ -1,5 +1,5 @@
import { EntityDTO, FromEntityType } from "@mikro-orm/core";
import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
import { EntityDTO, FromEntityType } from '@mikro-orm/core';
import { DwengoEntityRepository } from '../data/dwengo-entity-repository';
/**
* Utility function to perform an PUT on an object.
@ -7,7 +7,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
* @param object The object that needs to be changed
* @param data The datafields and their values that will be updated
* @param repo The repository on which this action needs to be performed
*
*
* @returns Nothing.
*/
export async function putObject<T extends object>(
@ -17,4 +17,4 @@ export async function putObject<T extends object>(
): Promise<void> {
repo.assign(object, data);
await repo.getEntityManager().flush();
}
}