fix(json-mapper): fix deserialize method when the input is an Array o…

…f model
tsedio · Sep 13, 2023 · 3ae4858 · 3ae4858
1 parent e9811c5
commit 3ae4858
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 5 deletions.
diff --git a/packages/specs/json-mapper/jest.config.js b/packages/specs/json-mapper/jest.config.js
@@ -6,10 +6,10 @@ module.exports = {
   roots: ["<rootDir>/src", "<rootDir>/test"],
   coverageThreshold: {
     global: {
-      statements: 99.66,
-      branches: 97.94,
+      statements: 99.53,
+      branches: 97.46,
       functions: 100,
-      lines: 99.66
+      lines: 99.53
     }
   },
   moduleNameMapper: {

diff --git a/packages/specs/json-mapper/src/domain/JsonSerializer.spec.ts b/packages/specs/json-mapper/src/domain/JsonSerializer.spec.ts
@@ -98,6 +98,20 @@ describe("JsonSerializer", () => {
       arrayLike.push(1);
 
       expect(serialize(arrayLike)).toEqual([1]);
+
+      class SetLike extends Set {}
+
+      const setLike = new SetLike();
+      setLike.add(1);
+
+      expect(serialize(setLike)).toEqual([1]);
+
+      class MapLike extends Map {}
+
+      const mapLike = new MapLike();
+      mapLike.set("i", 1);
+
+      expect(serialize(mapLike)).toEqual({i: 1});
     });
   });
   describe("Map<primitive>", () => {
@@ -644,6 +658,52 @@ describe("JsonSerializer", () => {
         prop4: null
       });
     });
+    it("should serialize array model with alias property", () => {
+      class SpaBooking {
+        @Required()
+        @Name("booking_number")
+        bookingNumber: string;
+
+        @Required()
+        status: string;
+
+        @Required()
+        @Name("order_id")
+        orderId: number;
+
+        @Required()
+        @Name("appointment_id")
+        appointmentId: number;
+
+        @Name("customer_id")
+        @Groups("!create", "!read")
+        customerId: number;
+      }
+
+      const appointments = [
+        {
+          bookingNumber: "100566224434",
+          status: "Booked",
+          orderId: 711376505,
+          appointmentId: 566224434,
+          customerId: null
+        }
+      ];
+
+      const serializedResult = serialize(appointments, {
+        type: SpaBooking
+      });
+
+      expect(serializedResult).toEqual([
+        {
+          booking_number: "100566224434",
+          status: "Booked",
+          order_id: 711376505,
+          appointment_id: 566224434,
+          customer_id: null
+        }
+      ]);
+    });
   });
   describe("class with toJSON/toClass", () => {
     it("should serialize model", () => {

diff --git a/packages/specs/json-mapper/src/domain/JsonSerializer.ts b/packages/specs/json-mapper/src/domain/JsonSerializer.ts
@@ -1,6 +1,7 @@
 import {
   classOf,
   hasJsonMethod,
+  isArray,
   isBoolean,
   isClassObject,
   isCollection,
@@ -21,10 +22,14 @@ import {getJsonMapperTypes} from "./JsonMapperTypesContainer";
 import {JsonSerializerOptions} from "./JsonSerializerOptions";
 import {Writer} from "./Writer";
 
+const getCollectionType = (input: any) => {
+  return isArray(input) ? "Array" : input instanceof Set ? "Set" : input instanceof Map ? "Map" : undefined;
+};
+
 function getBestType(type: Type<any>, obj: any) {
   const dataType = classOf(obj);
 
-  if (dataType && !isClassObject(dataType)) {
+  if (dataType && !isClassObject(dataType) && !isCollection(obj)) {
     return dataType;
   }
 
@@ -229,7 +234,7 @@ export class JsonSerializer extends JsonMapperCompiler<JsonSerializerOptions> {
     }
 
     if (input && isCollection(input)) {
-      return this.execMapper(nameOf(classOf(input)), input, options);
+      return this.execMapper(getCollectionType(input), input, options);
     }
 
     if (hasJsonMethod(input)) {