beenull/standardnotes-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: logs for removing already existing content and paging through diff of the content

Browse source
This commit is contained in:
Karol Sójko 2023-09-19 12:43:05 +02:00
parent 18181ed9df
commit a40b17b141
No known key found for this signature in database
GPG key ID: C2F813669419D05F
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts
View file

@ -35,8 +35,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
const { alreadyExistingInPrimary, newRevisionsInSecondary, updatedInSecondary } =
await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)
this.logger.info(
`[${dto.userUuid}] Removing ${alreadyExistingInPrimary.length} already existing revisions from secondary database`,
)
for (const existingRevisionUuid of alreadyExistingInPrimary) {
this.logger.info(`[${dto.userUuid}] Removing revision ${existingRevisionUuid} from secondary database`)
await (this.secondRevisionsRepository as RevisionRepositoryInterface).removeOneByUuid(
Uuid.create(existingRevisionUuid).getValue(),
userUuid,
@ -214,7 +216,9 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
newRevisionsInSecondary: string[]
updatedInSecondary: string[]
}> {
const totalRevisionsCountForUser = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
const totalRevisionsCountForUser = await (
this.secondRevisionsRepository as RevisionRepositoryInterface
).countByUserUuid(userUuid)
const totalPages = Math.ceil(totalRevisionsCountForUser / this.pageSize)
const alreadyExistingInPrimary: string[] = []

9
packages/syncing-server/src/Domain/UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser.ts
View file

@ -36,8 +36,11 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
const { alreadyExistingInPrimary, newItemsInSecondary, updatedInSecondary } =
await this.getNewItemsCreatedInSecondaryDatabase(userUuid)
this.logger.info(
`[${dto.userUuid}] Removing ${alreadyExistingInPrimary.length} already existing items from secondary database.`,
)
for (const existingItemUuid of alreadyExistingInPrimary) {
this.logger.info(`[${dto.userUuid}] Removing item ${existingItemUuid} from secondary database.`)
await (this.secondaryItemRepository as ItemRepositoryInterface).removeByUuid(
Uuid.create(existingItemUuid).getValue(),
)
@ -139,7 +142,9 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
const updatedInSecondary: string[] = []
const newItemsInSecondary: string[] = []
const totalItemsCountForUser = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
const totalItemsCountForUser = await (this.secondaryItemRepository as ItemRepositoryInterface).countAll({
userUuid: userUuid.value,
})
const totalPages = Math.ceil(totalItemsCountForUser / this.pageSize)
for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
const query: ItemQuery = {