resolve rebase conflicts

2026-03-11 08:54:26 +00:00 · 2024-06-13 18:41:35 +08:00 · 2024-06-13 18:41:35 +08:00 · 31f04344fc
commit 31f04344fc
parent 88e3d648c8
4 changed files with 0 additions and 5 deletions
--- 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',
--- 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(
--- a/packages/db/migrations/0182.do.folder_policy.sql
+++ b/packages/db/migrations/0182.do.folder_policy.sql
--- a/packages/db/migrations/0182.undo.folder_policy.sql
+++ b/packages/db/migrations/0182.undo.folder_policy.sql