From 2ef37cf499c06f1fd66413bad8b070e595d24bdb Mon Sep 17 00:00:00 2001 From: harisato Date: Wed, 13 Sep 2023 14:57:00 +0700 Subject: [PATCH 1/3] hotfix(be): fix count view not work --- src/task/task.service.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/task/task.service.ts b/src/task/task.service.ts index b1221e60..aca9af0f 100644 --- a/src/task/task.service.ts +++ b/src/task/task.service.ts @@ -10,7 +10,9 @@ export class TasksService { constructor( private configService: ConfigService, private graphqlSvc: GraphqlService, - ) {} + ) { + this.getViewsReport(); + } // every minute, on the 1st second @Cron('1 * * * * *') @@ -72,7 +74,9 @@ export class TasksService { const response = await this.runReport(); const env = this.configService.get('app.env'); - const subdomain_pattern = env !== '' ? `${env}\.` : ''; + const subdomain_pattern = ['dev', 'staging'].includes(env) + ? `${env}\.` + : ''; const regex = new RegExp( `https://${subdomain_pattern}punkga\.me(\/[A-Za-z]+)?\/comic\/[0-9]+\/chapter\/[0-9]+`, From 42fcb07182a4f1a01bbd922bb6c1e8fcc97a0eba Mon Sep 17 00:00:00 2001 From: harisato Date: Wed, 13 Sep 2023 15:03:35 +0700 Subject: [PATCH 2/3] fix(be): fix count view not work --- src/task/task.service.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/task/task.service.ts b/src/task/task.service.ts index aca9af0f..214c6f91 100644 --- a/src/task/task.service.ts +++ b/src/task/task.service.ts @@ -10,9 +10,7 @@ export class TasksService { constructor( private configService: ConfigService, private graphqlSvc: GraphqlService, - ) { - this.getViewsReport(); - } + ) {} // every minute, on the 1st second @Cron('1 * * * * *') From 75721538634f155060d954b7b4a6255130dee998 Mon Sep 17 00:00:00 2001 From: harisato Date: Mon, 18 Sep 2023 15:21:20 +0700 Subject: [PATCH 3/3] add query user public api --- .../tables/public_authorizer_users.yaml | 4 + hasura/metadata/query_collections.yaml | 131 ++++++++++-------- hasura/metadata/rest_endpoints.yaml | 9 ++ 3 files changed, 85 insertions(+), 59 deletions(-) diff --git a/hasura/metadata/databases/punkga-pg/tables/public_authorizer_users.yaml b/hasura/metadata/databases/punkga-pg/tables/public_authorizer_users.yaml index 1f35b151..2ac698d1 100644 --- a/hasura/metadata/databases/punkga-pg/tables/public_authorizer_users.yaml +++ b/hasura/metadata/databases/punkga-pg/tables/public_authorizer_users.yaml @@ -13,6 +13,10 @@ select_permissions: - role: anonymous permission: columns: + - bio + - birthdate + - email + - gender - id - nickname - picture diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml index 0d73cb99..dc8d63b6 100644 --- a/hasura/metadata/query_collections.yaml +++ b/hasura/metadata/query_collections.yaml @@ -663,65 +663,6 @@ } } } - - name: Public - Query creator by id - query: | - query QueryCreatorById ($id: Int!) { - creators(where: {id:{_eq:$id}}) { - id - avatar_url - bio - dob - gender - name - pen_name - socials - total_subscribers - isActive - created_at - manga_creators { - manga { - id - status - poster - banner - manga_creators { - creator { - name - pen_name - id - } - } - manga_total_likes { - likes - } - manga_total_views { - views - } - manga_tags { - tag { - tag_languages { - language_id - value - } - id - } - } - chapters(limit: 1, order_by: {chapter_number:desc}, where: {status:{_eq:"Published"}}) { - id - chapter_number - chapter_name - } - contract_addresses - manga_languages { - id - is_main_language - title - description - } - } - } - } - } - name: Public - Get manga detail query: | query GetMangaReadingDetail ($id: Int = 1, $user_id: bpchar = "") { @@ -794,3 +735,75 @@ } } } + - name: Public - Query creator by id + query: | + query QueryCreatorById ($id: Int!) { + creators(where: {id:{_eq:$id}}) { + id + avatar_url + bio + dob + gender + name + pen_name + socials + total_subscribers + isActive + created_at + manga_creators(where: {manga:{status:{_neq:"Removed"}}}) { + manga { + id + status + poster + banner + manga_creators { + creator { + name + pen_name + id + } + } + manga_total_likes { + likes + } + manga_total_views { + views + } + manga_tags { + tag { + tag_languages { + language_id + value + } + id + } + } + chapters(limit: 1, order_by: {chapter_number:desc}, where: {status:{_eq:"Published"}}) { + id + chapter_number + chapter_name + } + contract_addresses + manga_languages { + id + is_main_language + title + description + } + } + } + } + } + - name: Public - Query User + query: | + query QueryUser ($user_id: bpchar = "") { + authorizer_users(where: {id:{_eq:$user_id}}) { + id + email + nickname + birthdate + bio + picture + gender + } + } diff --git a/hasura/metadata/rest_endpoints.yaml b/hasura/metadata/rest_endpoints.yaml index b1ab7d02..92057ed9 100644 --- a/hasura/metadata/rest_endpoints.yaml +++ b/hasura/metadata/rest_endpoints.yaml @@ -241,6 +241,15 @@ - GET name: Public - Get trending manga url: public/trending +- comment: "" + definition: + query: + collection_name: allowed-queries + query_name: Public - Query User + methods: + - GET + name: Public - Query User + url: public/users/:user_id - comment: "" definition: query: