From 7bff3dee24d058be91cb278b09692b4ff4396106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@protonmail.com>
Date: Tue, 23 Aug 2022 13:20:34 +0200
Subject: [PATCH] fix(services): counting trashed and archived items

---
 packages/services/src/Domain/Item/ItemCounter.spec.ts | 6 +++++-
 packages/services/src/Domain/Item/ItemCounter.ts      | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/services/src/Domain/Item/ItemCounter.spec.ts b/packages/services/src/Domain/Item/ItemCounter.spec.ts
index 0b27d9ed9..ac00acc44 100644
--- a/packages/services/src/Domain/Item/ItemCounter.spec.ts
+++ b/packages/services/src/Domain/Item/ItemCounter.spec.ts
@@ -13,6 +13,10 @@ describe('ItemCounter', () => {
       {
         trashed: true,
       } as jest.Mocked<SNNote>,
+      {
+        archived: true,
+        trashed: true,
+      } as jest.Mocked<SNNote>,
       {
         content_type: ContentType.Note,
       } as jest.Mocked<SNNote>,
@@ -23,7 +27,7 @@ describe('ItemCounter', () => {
 
     expect(createCounter().countNotesAndTags(items)).toEqual({
       archived: 1,
-      deleted: 1,
+      deleted: 2,
       notes: 1,
       tags: 1,
     })
diff --git a/packages/services/src/Domain/Item/ItemCounter.ts b/packages/services/src/Domain/Item/ItemCounter.ts
index a609fe19f..879b93ccf 100644
--- a/packages/services/src/Domain/Item/ItemCounter.ts
+++ b/packages/services/src/Domain/Item/ItemCounter.ts
@@ -13,13 +13,13 @@ export class ItemCounter implements ItemCounterInterface {
     }
 
     for (const item of items) {
-      if (item.archived) {
-        counts.archived++
+      if (item.trashed) {
+        counts.deleted++
 
         continue
       }
-      if (item.trashed) {
-        counts.deleted++
+      if (item.archived) {
+        counts.archived++
 
         continue
       }