Fix transactions

src/auth/auth.controller.ts

@@ -34,8 +34,8 @@ export class AuthController {
         await this.collectionService.createSider(user);
         if (createUserDto.publicBundleId) {
           const publicBundleCollection: Collection = await this.collectionService.getCollectionById(createUserDto.publicBundleId, user);
-          const pictoIdsFromBundle: number[] = await Promise.all(publicBundleCollection?.pictos.map(async (picto) => await this.collectionService.copyPicto(rootId, picto, user)));
-          const collectionIdsFromBundle: number[] = await Promise.all(publicBundleCollection?.collections.map(async (collection) => await this.collectionService.copyCollection(rootId, collection.id, user)))
+          const pictoIdsFromBundle: number[] = await Promise.all(publicBundleCollection?.pictos.map(async (picto) => this.collectionService.copyPicto(rootId, picto, user)));
+          const collectionIdsFromBundle: number[] = await Promise.all(publicBundleCollection?.collections.map(async (collection) => this.collectionService.copyCollectionWithTransaction(rootId, collection.id, user)));
           const modifyCollectionDto : modifyCollectionDto = {
             meaning : null,
             speech : null,
@@ -52,7 +52,6 @@ export class AuthController {
           const multipleShareCollectionDto: multipleShareCollectionDto = { access: 1, usernames: user.directSharers, role: 'editor'}
           await this.collectionService.shareCollectionVerification(rootId, user, multipleShareCollectionDto);
         }
-        console.log(await this.collectionService.getCollectionById(rootId, user))
         return;
     }
 

src/collection/collection.controller.ts

@@ -79,23 +79,8 @@ export class CollectionController {
   @UseGuards(AuthGuard())
   @Post('copy')
   @ApiOperation({summary : 'copy a collection with its ID'})
-  async copyCollection(@Body() copyCollectionDto: copyCollectionDto, @GetUser() user: User): Promise<Collection>{
-    const fatherCollection = await this.collectionService.getCollectionById(copyCollectionDto.fatherCollectionId, user);
-    const copiedId = await this.collectionService.copyCollection(copyCollectionDto.fatherCollectionId, copyCollectionDto.collectionId, user);
-    let fatherCollectionsIds = fatherCollection.collections.map(collection => {
-      return collection.id;
-    })
-    fatherCollectionsIds.push(copiedId);
-    const modifyCollectionDto : modifyCollectionDto = {
-      meaning : null,
-      speech : null,
-      pictoIds : null,
-      priority : 10,
-      color : null,
-      collectionIds : fatherCollectionsIds,
-      pictohubId: null
-    }
-    await this.collectionService.modifyCollection(copyCollectionDto.fatherCollectionId, user, modifyCollectionDto, null);
+  async copyCollection(@Body() copyCollectionDto: copyCollectionDto, @GetUser() user: User): Promise<Collection>{ 
+    await this.collectionService.copyCollectionWithTransaction(copyCollectionDto.fatherCollectionId, copyCollectionDto.collectionId, user);
     return this.getCollectionById(copyCollectionDto.fatherCollectionId, user);
   }
 

src/collection/collection.repository.ts

@@ -10,7 +10,7 @@ import { Picto } from 'src/entities/picto.entity';
 import { User } from 'src/entities/user.entity';
 import { parseNumberArray } from 'src/utilities/tools';
 import { CustomRepository } from 'src/utilities/typeorm-ex.decorator';
-import { Repository } from 'typeorm';
+import { EntityManager, Repository } from 'typeorm';
 import { createCollectionDto } from './dto/collection.create.dto';
 import { modifyCollectionDto } from './dto/collection.modify.dto';
 import { SearchCollectionDto } from './dto/collection.search.public.dto';
@@ -26,6 +26,7 @@ export class CollectionRepository extends Repository<Collection> {
     createCollectionDto: createCollectionDto,
     user: User,
     filename: string,
+    manager?: EntityManager,
   ): Promise<Collection> {
     let { meaning, speech, pictoIds, collectionIds, color, pictohubId } =
       createCollectionDto;
@@ -65,7 +66,12 @@ export class CollectionRepository extends Repository<Collection> {
       throw new NotFoundException(`filename not found`);
     }
     try {
+      if (!manager) {
       await collection.save();
+      }
+      else {
+        await manager.save(Collection, collection);
+      }
     } catch (error) {
       throw new InternalServerErrorException(error);
     }
@@ -77,6 +83,7 @@ export class CollectionRepository extends Repository<Collection> {
     modifyCollectionDto: modifyCollectionDto,
     user: User,
     filename: string,
+    manager?: EntityManager
   ): Promise<Collection> {
     let {
       meaning,
@@ -124,8 +131,13 @@ export class CollectionRepository extends Repository<Collection> {
       collection.color = color;
     }
     try {
+      if (!manager) {
       await collection.save();
+      } else {
+        await manager.save(Collection, collection);
+      }
     } catch (error) {
+      console.error(error);
       throw new InternalServerErrorException(
         `could not save collection properly`,
       );