From 31f04344fccd3bf3f4a7d27b3b7294300293e859 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 13 Jun 2024 18:41:35 +0800
Subject: [PATCH] resolve rebase conflicts

---
 packages/api/src/entity/folder_policy.ts                       | 3 ---
 packages/api/test/resolvers/folder_policy.test.ts              | 2 --
 .../{0181.do.folder_policy.sql => 0182.do.folder_policy.sql}   | 0
 ...0181.undo.folder_policy.sql => 0182.undo.folder_policy.sql} | 0
 4 files changed, 5 deletions(-)
 rename packages/db/migrations/{0181.do.folder_policy.sql => 0182.do.folder_policy.sql} (100%)
 rename packages/db/migrations/{0181.undo.folder_policy.sql => 0182.undo.folder_policy.sql} (100%)

diff --git a/packages/api/src/entity/folder_policy.ts b/packages/api/src/entity/folder_policy.ts
index b49e8cb72..11427003b 100644
--- a/packages/api/src/entity/folder_policy.ts
+++ b/packages/api/src/entity/folder_policy.ts
@@ -35,9 +35,6 @@ export class FolderPolicy {
   @Column('int')
   afterDays!: number
 
-  @Column('int')
-  minimumItems!: number
-
   @CreateDateColumn({
     type: 'timestamptz',
     default: () => 'CURRENT_TIMESTAMP',
diff --git a/packages/api/test/resolvers/folder_policy.test.ts b/packages/api/test/resolvers/folder_policy.test.ts
index c65955566..4112acb4f 100644
--- a/packages/api/test/resolvers/folder_policy.test.ts
+++ b/packages/api/test/resolvers/folder_policy.test.ts
@@ -102,7 +102,6 @@ describe('Folder Policy API', () => {
         folder: 'test-folder',
         action: FolderPolicyAction.Archive,
         afterDays: 30,
-        minimumItems: 10,
       }
 
       const res = await graphqlRequest(mutation, authToken, { input }).expect(
@@ -160,7 +159,6 @@ describe('Folder Policy API', () => {
         id: existingPolicy.id,
         action: FolderPolicyAction.Delete,
         afterDays: 30,
-        minimumItems: 10,
       }
 
       const res = await graphqlRequest(mutation, authToken, { input }).expect(
diff --git a/packages/db/migrations/0181.do.folder_policy.sql b/packages/db/migrations/0182.do.folder_policy.sql
similarity index 100%
rename from packages/db/migrations/0181.do.folder_policy.sql
rename to packages/db/migrations/0182.do.folder_policy.sql
diff --git a/packages/db/migrations/0181.undo.folder_policy.sql b/packages/db/migrations/0182.undo.folder_policy.sql
similarity index 100%
rename from packages/db/migrations/0181.undo.folder_policy.sql
rename to packages/db/migrations/0182.undo.folder_policy.sql