Merge pull request #112 from codeforjapan/mitomo/random_ids

🐛 Fix request body randomID to Array
mamori-i-japan · May 6, 2020 · ead939e · ead939e
2 parents 313e78b + a5cbd3a
commit ead939e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/src/users/dto/delete-user-organization.dto.ts b/src/users/dto/delete-user-organization.dto.ts
@@ -1,12 +1,21 @@
-import { ApiPropertyOptional } from '@nestjs/swagger'
-import { IsString, IsOptional, IsNotEmpty } from 'class-validator'
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
+import { IsString, IsOptional, IsNotEmpty, IsArray, ValidateNested } from 'class-validator'
+import { Type } from 'class-transformer'
 
-export class DeleteUserOrganizationDto {
+export class RandomIDDto {
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()
   @IsNotEmpty()
   randomID: string
+}
+
+export class DeleteUserOrganizationDto {
+  @ApiProperty({ type: RandomIDDto, isArray: true })
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => RandomIDDto)
+  randomIDs: RandomIDDto[]
 
   // Keys without any decorators are non-Whitelisted. Validator will throw error if it's passed in payload.
   userId: string

diff --git a/src/users/users.repository.ts b/src/users/users.repository.ts
@@ -98,23 +98,27 @@ export class UsersRepository {
   async deleteDiagnosisKeysForOrg(
     deleteUserOrganization: DeleteUserOrganizationDto
   ): Promise<void> {
-    const { organizationCode, randomID } = deleteUserOrganization
+    const { organizationCode, randomIDs } = deleteUserOrganization
 
-    if (!randomID) {
+    if (randomIDs.length === 0) {
       return
     }
 
-    await (await this.firestoreDB)
-      .collection('diagnosisKeysForOrg')
-      .doc(organizationCode)
-      .collection('tempIDs')
-      .where('randomID', '==', randomID)
-      .get()
-      .then((query) => {
-        query.forEach((doc) => {
-          doc.ref.delete()
-        })
+    await Promise.all(
+      randomIDs.map(async ({ randomID }) => {
+        await (await this.firestoreDB)
+          .collection('diagnosisKeysForOrg')
+          .doc(organizationCode)
+          .collection('tempIDs')
+          .where('randomID', '==', randomID)
+          .get()
+          .then((query) => {
+            query.forEach((doc) => {
+              doc.ref.delete()
+            })
+          })
       })
+    )
   }
 
   async createDiagnosisKeysForOrg(