chore(release): publish new version

- @standardnotes/syncing-server@1.25.3

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.25.2...@standardnotes/syncing-server@1.25.3) (2022-12-13)
+
+### Bug Fixes
+
+* **syncing-server:** revisions ownership procedure destructured ([124c443](https://github.com/standardnotes/syncing-server-js/commit/124c4435285c2c2e8d0ce8b47907ebd47af27576))
+
+## [1.25.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.25.1...@standardnotes/syncing-server@1.25.2) (2022-12-13)
+
+### Bug Fixes
+
+* **syncing-server:** change revisions migration to notes ([c419f1c](https://github.com/standardnotes/syncing-server-js/commit/c419f1ce220c27acabfc813a30b3edd6c4aadaa1))
+
+## [1.25.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.25.0...@standardnotes/syncing-server@1.25.1) (2022-12-13)
+
+### Bug Fixes
+
+* **syncing-server:** revisions procedure properties ([cd101b9](https://github.com/standardnotes/syncing-server-js/commit/cd101b96eae8969a4dd2387deb1d4e8679ead216))
+
 # [1.25.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.24.7...@standardnotes/syncing-server@1.25.0) (2022-12-12)
 
 ### Features

packages/syncing-server/bin/revisions.ts

@@ -11,16 +11,25 @@ import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFact
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { ItemRepositoryInterface } from '../src/Domain/Item/ItemRepositoryInterface'
 import { Stream } from 'stream'
+import { ContentType } from '@standardnotes/common'
 
 const fixRevisionsOwnership = async (
+  year: number,
+  month: number,
   itemRepository: ItemRepositoryInterface,
   domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
   logger: Logger,
 ): Promise<void> => {
+  const createdAfter = new Date(`${year}-${month}-1`)
+  const createdBefore = new Date(`${month !== 12 ? year : year + 1}-${month !== 12 ? month + 1 : 1}-1`)
+
+  logger.info(`Processing items between ${createdAfter.toISOString} and ${createdBefore.toISOString}`)
+
   const stream = await itemRepository.streamAll({
-    createdBefore: new Date('2022-11-23'),
+    createdBetween: [createdAfter, createdBefore],
     selectFields: ['user_uuid', 'uuid'],
+    contentType: [ContentType.Note, ContentType.File],
   })
 
   return new Promise((resolve, reject) => {
@@ -30,7 +39,7 @@ const fixRevisionsOwnership = async (
           objectMode: true,
           transform: async (rawItemData, _encoding, callback) => {
             try {
-              if (!rawItemData.item_user_uuid || !rawItemData.item_uuid) {
+              if (!rawItemData.user_uuid || !rawItemData.item_uuid) {
                 logger.error('Could not process item %O', rawItemData)
 
                 return callback()
@@ -38,7 +47,7 @@ const fixRevisionsOwnership = async (
 
               await domainEventPublisher.publish(
                 domainEventFactory.createRevisionsOwnershipUpdateRequestedEvent({
-                  userUuid: rawItemData.item_user_uuid,
+                  userUuid: rawItemData.user_uuid,
                   itemUuid: rawItemData.item_uuid,
                 }),
               )
@@ -46,11 +55,15 @@ const fixRevisionsOwnership = async (
               logger.error(`Could not process item ${rawItemData.item_uuid}: ${(error as Error).message}`)
             }
 
-            callback()
+            return callback()
           },
         }),
       )
-      .on('finish', resolve)
+      .on('finish', () => {
+        logger.info(`Finished processing items between ${createdAfter.toISOString} and ${createdBefore.toISOString}`)
+
+        resolve()
+      })
       .on('error', reject)
   })
 }
@@ -68,7 +81,16 @@ void container.load().then((container) => {
   const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
   const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
 
-  Promise.resolve(fixRevisionsOwnership(itemRepository, domainEventFactory, domainEventPublisher, logger))
+  const years = [2016, 2017, 2018, 2019, 2020, 2021, 2022]
+
+  const promises = []
+  for (const year of years) {
+    for (let i = 1; i <= 12; i++) {
+      promises.push(fixRevisionsOwnership(year, i, itemRepository, domainEventFactory, domainEventPublisher, logger))
+    }
+  }
+
+  Promise.all(promises)
     .then(() => {
       logger.info('revisions ownership fix complete.')
 

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.25.0",
+  "version": "1.25.3",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/syncing-server/src/Domain/Item/ItemQuery.ts

@@ -5,10 +5,10 @@ export type ItemQuery = {
   uuids?: Array<string>
   lastSyncTime?: number
   syncTimeComparison?: '>' | '>='
-  contentType?: string
+  contentType?: string | string[]
   deleted?: boolean
   offset?: number
   limit?: number
-  createdBefore?: Date
+  createdBetween?: Date[]
   selectFields?: string[]
 }

packages/syncing-server/src/Infra/MySQL/MySQLItemRepository.ts

@@ -148,15 +148,22 @@ export class MySQLItemRepository implements ItemRepositoryInterface {
       queryBuilder.andWhere('item.deleted = :deleted', { deleted: query.deleted })
     }
     if (query.contentType) {
-      queryBuilder.andWhere('item.content_type = :contentType', { contentType: query.contentType })
+      if (Array.isArray(query.contentType)) {
+        queryBuilder.andWhere('item.content_type IN (:...contentTypes)', { contentTypes: query.contentType })
+      } else {
+        queryBuilder.andWhere('item.content_type = :contentType', { contentType: query.contentType })
+      }
     }
     if (query.lastSyncTime && query.syncTimeComparison) {
       queryBuilder.andWhere(`item.updated_at_timestamp ${query.syncTimeComparison} :lastSyncTime`, {
         lastSyncTime: query.lastSyncTime,
       })
     }
-    if (query.createdBefore !== undefined) {
-      queryBuilder.andWhere('item.created_at < :createdAt', { createdAt: query.createdBefore.toISOString() })
+    if (query.createdBetween !== undefined) {
+      queryBuilder.andWhere('item.created_at BETWEEN :createdAfter AND :createdBefore', {
+        createdAfter: query.createdBetween[0].toISOString(),
+        createdBefore: query.createdBetween[1].toISOString(),
+      })
     }
     if (query.offset !== undefined) {
       queryBuilder.skip(query.offset)