fix(conflict-resolution): ensure conflict resolution is done on raw docs rather than entity instance

Author: sleidig

src/app/child-dev-project/attendance/attendance-month-conflict-resolution-strategy.ts

@@ -3,13 +3,16 @@ import { ConflictResolutionStrategy } from "../../conflict-resolution/auto-resol
 import { AttendanceMonth } from "./model/attendance-month";
 import _ from "lodash";
 import { diff } from "deep-object-diff";
+import { EntitySchemaService } from "../../core/entity/schema/entity-schema.service";
 
 /**
  * Auto resolve simple database document conflicts concerning {@link AttendanceMonth} entities.
  */
 @Injectable()
 export class AttendanceMonthConflictResolutionStrategy
   implements ConflictResolutionStrategy {
+  constructor(private entitySchemaService: EntitySchemaService) {}
+
   /**
    * Checks if the given conflict is about AttendanceMonth entities (otherwise this strategy doesn't apply)
    * and suggests whether the conflict is trivial and can be automatically deleted.
@@ -24,6 +27,17 @@ export class AttendanceMonthConflictResolutionStrategy
       return false;
     }
 
+    if (typeof currentDoc.getId === "function") {
+      currentDoc = this.entitySchemaService.transformEntityToDatabaseFormat(
+        currentDoc
+      );
+    }
+    if (typeof conflictingDoc.getId === "function") {
+      conflictingDoc = this.entitySchemaService.transformEntityToDatabaseFormat(
+        conflictingDoc
+      );
+    }
+
     const currentDocC = _.merge({}, currentDoc);
     delete currentDocC._rev;
     const conflictingDocC = _.merge({}, conflictingDoc);
@@ -53,6 +67,10 @@ export class AttendanceMonthConflictResolutionStrategy
       null,
     ]);
 
+    console.log(currentDoc);
+    console.log(conflictingDoc);
+    console.log("isIrrelevantAttendanceMonthConflict", simplifiedDiff);
+
     return _.isObjectLike(simplifiedDiff) && _.isEmpty(simplifiedDiff);
   }
 

src/app/child-dev-project/attendance/attendance-month-conflict-resolution.spec.ts

@@ -2,13 +2,17 @@ import { TestBed } from "@angular/core/testing";
 import { AttendanceMonthConflictResolutionStrategy } from "./attendance-month-conflict-resolution-strategy";
 import { AttendanceMonth } from "./model/attendance-month";
 import { AttendanceDay, AttendanceStatus } from "./model/attendance-day";
+import { EntitySchemaService } from "../../core/entity/schema/entity-schema.service";
 
-describe("AutoResolutionService", () => {
+describe("AttendanceMonthConflictResolutionStrategy", () => {
   let service: AttendanceMonthConflictResolutionStrategy;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [AttendanceMonthConflictResolutionStrategy],
+      providers: [
+        AttendanceMonthConflictResolutionStrategy,
+        EntitySchemaService,
+      ],
     });
     service = TestBed.inject<AttendanceMonthConflictResolutionStrategy>(
       AttendanceMonthConflictResolutionStrategy
@@ -35,6 +39,7 @@ describe("AutoResolutionService", () => {
       currentDoc,
       conflictingDoc
     );
+
     expect(result).toBe(true);
   });