From 3327334bf65fd110ecd3a70f29b220bc79f0412a Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 16 Nov 2023 17:25:00 +0800 Subject: [PATCH 1/2] update category in filters table from Search to inbox --- .../db/migrations/0147.do.update_category_in_filters.sql | 9 +++++++++ .../migrations/0147.undo.update_category_in_filters.sql | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100755 packages/db/migrations/0147.do.update_category_in_filters.sql create mode 100755 packages/db/migrations/0147.undo.update_category_in_filters.sql diff --git a/packages/db/migrations/0147.do.update_category_in_filters.sql b/packages/db/migrations/0147.do.update_category_in_filters.sql new file mode 100755 index 000000000..6b57b9397 --- /dev/null +++ b/packages/db/migrations/0147.do.update_category_in_filters.sql @@ -0,0 +1,9 @@ +-- Type: DO +-- Name: update_category_in_filters +-- Description: Update category column in filters table + +BEGIN; + +UPDATE omnivore.filters SET category = 'inbox' WHERE category = 'Search'; + +COMMIT; diff --git a/packages/db/migrations/0147.undo.update_category_in_filters.sql b/packages/db/migrations/0147.undo.update_category_in_filters.sql new file mode 100755 index 000000000..82cabc095 --- /dev/null +++ b/packages/db/migrations/0147.undo.update_category_in_filters.sql @@ -0,0 +1,9 @@ +-- Type: UNDO +-- Name: update_category_in_filters +-- Description: Update category column in filters table + +BEGIN; + +UPDATE omnivore.filters SET category = 'Search' WHERE category = 'inbox'; + +COMMIT; From 0869cfd4777ff0e0cc91ef895c12237c8668b3a4 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 16 Nov 2023 17:50:30 +0800 Subject: [PATCH 2/2] replace category with folder in the GQL type --- packages/api/src/entity/filter.ts | 3 +++ packages/api/src/generated/graphql.ts | 8 ++++---- packages/api/src/generated/schema.graphql | 6 +++--- packages/api/src/resolvers/filters/index.ts | 2 +- packages/api/src/schema.ts | 6 +++--- ..._in_filters.sql => 0147.do.add_folder_to_filters.sql} | 2 +- .../db/migrations/0147.undo.add_folder_to_filters.sql | 9 +++++++++ .../migrations/0147.undo.update_category_in_filters.sql | 9 --------- 8 files changed, 24 insertions(+), 21 deletions(-) rename packages/db/migrations/{0147.do.update_category_in_filters.sql => 0147.do.add_folder_to_filters.sql} (61%) create mode 100755 packages/db/migrations/0147.undo.add_folder_to_filters.sql delete mode 100755 packages/db/migrations/0147.undo.update_category_in_filters.sql diff --git a/packages/api/src/entity/filter.ts b/packages/api/src/entity/filter.ts index 2ed86ae5f..8a54bc245 100644 --- a/packages/api/src/entity/filter.ts +++ b/packages/api/src/entity/filter.ts @@ -46,4 +46,7 @@ export class Filter { @Column('boolean', { default: true }) visible!: boolean + + @Column('text') + folder!: string } diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index 164ac7de4..4e2d86713 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -809,11 +809,11 @@ export type FeedsSuccess = { export type Filter = { __typename?: 'Filter'; - category: Scalars['String']; createdAt: Scalars['Date']; defaultFilter?: Maybe; description?: Maybe; filter: Scalars['String']; + folder: Scalars['String']; id: Scalars['ID']; name: Scalars['String']; position: Scalars['Int']; @@ -2223,9 +2223,9 @@ export enum SaveFilterErrorCode { } export type SaveFilterInput = { - category?: InputMaybe; description?: InputMaybe; filter: Scalars['String']; + folder?: InputMaybe; name: Scalars['String']; position?: InputMaybe; }; @@ -2857,9 +2857,9 @@ export enum UpdateFilterErrorCode { } export type UpdateFilterInput = { - category?: InputMaybe; description?: InputMaybe; filter?: InputMaybe; + folder?: InputMaybe; id: Scalars['String']; name?: InputMaybe; position?: InputMaybe; @@ -4911,11 +4911,11 @@ export type FeedsSuccessResolvers = { - category?: Resolver; createdAt?: Resolver; defaultFilter?: Resolver, ParentType, ContextType>; description?: Resolver, ParentType, ContextType>; filter?: Resolver; + folder?: Resolver; id?: Resolver; name?: Resolver; position?: Resolver; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index 52e666e42..9eeea6944 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -716,11 +716,11 @@ type FeedsSuccess { } type Filter { - category: String! createdAt: Date! defaultFilter: Boolean description: String filter: String! + folder: String! id: ID! name: String! position: Int! @@ -1683,9 +1683,9 @@ enum SaveFilterErrorCode { } input SaveFilterInput { - category: String description: String filter: String! + folder: String name: String! position: Int } @@ -2270,9 +2270,9 @@ enum UpdateFilterErrorCode { } input UpdateFilterInput { - category: String description: String filter: String + folder: String id: String! name: String position: Int diff --git a/packages/api/src/resolvers/filters/index.ts b/packages/api/src/resolvers/filters/index.ts index 04675677b..052a4d299 100644 --- a/packages/api/src/resolvers/filters/index.ts +++ b/packages/api/src/resolvers/filters/index.ts @@ -37,7 +37,7 @@ export const saveFilterResolver = authorized< return t.getRepository(Filter).save({ user: { id: uid }, name: input.name, - category: 'Search', + folder: input.folder ?? undefined, description: '', position: input.position ?? 0, filter: input.filter, diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index c869bb8ce..e532f1165 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -2190,7 +2190,7 @@ const schema = gql` input SaveFilterInput { name: String! filter: String! - category: String + folder: String description: String position: Int } @@ -2206,7 +2206,7 @@ const schema = gql` name: String! filter: String! position: Int! - category: String! + folder: String! description: String createdAt: Date! updatedAt: Date @@ -2260,7 +2260,7 @@ const schema = gql` name: String filter: String position: Int - category: String + folder: String description: String visible: Boolean } diff --git a/packages/db/migrations/0147.do.update_category_in_filters.sql b/packages/db/migrations/0147.do.add_folder_to_filters.sql similarity index 61% rename from packages/db/migrations/0147.do.update_category_in_filters.sql rename to packages/db/migrations/0147.do.add_folder_to_filters.sql index 6b57b9397..473677c86 100755 --- a/packages/db/migrations/0147.do.update_category_in_filters.sql +++ b/packages/db/migrations/0147.do.add_folder_to_filters.sql @@ -4,6 +4,6 @@ BEGIN; -UPDATE omnivore.filters SET category = 'inbox' WHERE category = 'Search'; +ALTER TABLE omnivore.filters ADD COLUMN folder text NOT NULL DEFAULT 'inbox'; COMMIT; diff --git a/packages/db/migrations/0147.undo.add_folder_to_filters.sql b/packages/db/migrations/0147.undo.add_folder_to_filters.sql new file mode 100755 index 000000000..89142a0ce --- /dev/null +++ b/packages/db/migrations/0147.undo.add_folder_to_filters.sql @@ -0,0 +1,9 @@ +-- Type: UNDO +-- Name: add_folder_to_filters +-- Description: Add folder column to filters table + +BEGIN; + +ALTER TABLE omnivore.filters DROP COLUMN folder; + +COMMIT; diff --git a/packages/db/migrations/0147.undo.update_category_in_filters.sql b/packages/db/migrations/0147.undo.update_category_in_filters.sql deleted file mode 100755 index 82cabc095..000000000 --- a/packages/db/migrations/0147.undo.update_category_in_filters.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Type: UNDO --- Name: update_category_in_filters --- Description: Update category column in filters table - -BEGIN; - -UPDATE omnivore.filters SET category = 'Search' WHERE category = 'inbox'; - -COMMIT;