Bladeren bron

fix(syncing-server): persistence mapping for deleted field

Karol Sójko 1 jaar geleden
bovenliggende
commit
baf4b2c1d2

+ 1 - 3
packages/syncing-server/src/Infra/TypeORM/MongoDBItemRepository.ts

@@ -189,9 +189,7 @@ export class MongoDBItemRepository implements ItemRepositoryInterface {
       }
     }
     if (query.deleted !== undefined) {
-      const deletedMixedValues = query.deleted === true ? [true, 1] : [false, 0]
-
-      options.where = { ...options.where, deleted: { $in: deletedMixedValues } }
+      options.where = { ...options.where, deleted: { $eq: query.deleted } }
     }
     if (query.contentType) {
       if (Array.isArray(query.contentType)) {

+ 2 - 2
packages/syncing-server/src/Mapping/Persistence/SQLItemPersistenceMapper.ts

@@ -99,7 +99,7 @@ export class SQLItemPersistenceMapper implements MapperInterface<Item, SQLItem>
         encItemKey: projection.encItemKey,
         authHash: projection.authHash,
         userUuid,
-        deleted: projection.deleted,
+        deleted: !!projection.deleted,
         dates,
         timestamps,
         updatedWithSession,
@@ -127,7 +127,7 @@ export class SQLItemPersistenceMapper implements MapperInterface<Item, SQLItem>
     typeorm.encItemKey = domain.props.encItemKey
     typeorm.authHash = domain.props.authHash
     typeorm.userUuid = domain.props.userUuid.value
-    typeorm.deleted = domain.props.deleted
+    typeorm.deleted = !!domain.props.deleted
     typeorm.createdAt = domain.props.dates.createdAt
     typeorm.updatedAt = domain.props.dates.updatedAt
     typeorm.createdAtTimestamp = domain.props.timestamps.createdAt

+ 2 - 2
packages/syncing-server/src/Mapping/Persistence/SQLLegacyItemPersistenceMapper.ts

@@ -64,7 +64,7 @@ export class SQLLegacyItemPersistenceMapper implements MapperInterface<Item, SQL
         encItemKey: projection.encItemKey,
         authHash: projection.authHash,
         userUuid,
-        deleted: projection.deleted,
+        deleted: !!projection.deleted,
         dates,
         timestamps,
         updatedWithSession,
@@ -90,7 +90,7 @@ export class SQLLegacyItemPersistenceMapper implements MapperInterface<Item, SQL
     typeorm.encItemKey = domain.props.encItemKey
     typeorm.authHash = domain.props.authHash
     typeorm.userUuid = domain.props.userUuid.value
-    typeorm.deleted = domain.props.deleted
+    typeorm.deleted = !!domain.props.deleted
     typeorm.createdAt = domain.props.dates.createdAt
     typeorm.updatedAt = domain.props.dates.updatedAt
     typeorm.createdAtTimestamp = domain.props.timestamps.createdAt