fixed duplicates and inconsistent tests

DA0-DA0 · Jun 12, 2024 · 79288f1 · 79288f1
1 parent 8ad0ce1
commit 79288f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/db/models/WasmCodeKeyId.ts b/src/db/models/WasmCodeKeyId.ts
@@ -3,7 +3,6 @@ import {
   BelongsTo,
   Column,
   Model,
-  PrimaryKey,
   Table,
 } from 'sequelize-typescript'
 
@@ -19,10 +18,6 @@ import { WasmCodeKey } from './WasmCodeKey'
   ],
 })
 export class WasmCodeKeyId extends Model {
-  @PrimaryKey
-  @Column
-  declare id: number
-
   @AllowNull(false)
   @Column
   declare codeKey: string

diff --git a/src/services/wasm-codes/wasm-code.service.test.ts b/src/services/wasm-codes/wasm-code.service.test.ts
@@ -19,7 +19,7 @@ describe('WasmCodeService tests', () => {
     }
 
     await WasmCodeKey.createFromKeyAndIds('codeKey1', [1, 2, 3])
-    await WasmCodeKey.createFromKeyAndIds('codeKey2', [4, 5, 6])
+    await WasmCodeKey.createFromKeyAndIds('codeKey2', [4, 5, 6, 5, 5, 5])
     await WasmCodeKey.createFromKeyAndIds('codeKey3', [1, 3, 5])
 
     await wasmCodeService.reloadWasmCodeIdsFromDB()

diff --git a/src/services/wasm-codes/wasm-code.service.ts b/src/services/wasm-codes/wasm-code.service.ts
@@ -136,10 +136,15 @@ export class WasmCodeService implements WasmCodeAdapter {
   }
 
   /**
-   * Return a copy of the list of wasm codes.
+   * Return a sorted list of wasm codes with sorted IDs.
    */
   getWasmCodes(): WasmCode[] {
-    return [...this.wasmCodes]
+    return this.wasmCodes
+      .map(
+        (wasmCode: WasmCode) =>
+          new WasmCode(wasmCode.codeKey, wasmCode.codeIds.sort())
+      )
+      .sort((a, b) => a.codeKey.localeCompare(b.codeKey))
   }
 
   /**