feat(hasura): update api

aura-nw · Jul 12, 2023 · 1282330 · 1282330
1 parent 9a25300
commit 1282330
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 54 deletions.
diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
@@ -106,27 +106,6 @@
               updated_at
             }
           }
-      - name: Public - Get Chapter Comments
-        query: |
-          query GetChapterComments ($chapter_id: Int = 10) {
-            social_activities(where: {_and:{action_type:{_eq:"COMMENT"},ref_activity:{_is_null:true},chapter_id:{_eq:$chapter_id}}}) {
-              id
-              social_activities_authorizer_user {
-                id
-                nickname
-              }
-              content
-              created_at
-              replies: social_activities {
-                social_activities_authorizer_user {
-                  id
-                  nickname
-                }
-                content
-                created_at
-              }
-            }
-          }
       - name: User - Subscribe manga
         query: |
           mutation UserSubscribeManga ($manga_id: Int = 10) {
@@ -475,17 +454,6 @@
               }
             }
           }
-      - name: User - Add comment in chapter
-        query: |
-          mutation AddUserComment ($chapter_id: Int = 21, $ref_activity: Int, $content: String = "") {
-            insert_social_activities_one(object: {chapter_id:$chapter_id,content:$content,ref_activity:$ref_activity,action_type:"COMMENT"}) {
-              id
-              content
-              user_id
-              ref_activity
-              action_type
-            }
-          }
       - name: Public - Get chapter detail
         query: |
           query GetChapterReadingDetail ($manga_id: Int = 18, $chapter_number: Int = 1, $language_id: Int = 1, $user_id: String = "") {
@@ -705,3 +673,34 @@
               }
             }
           }
+      - name: Public - Get Chapter Comments
+        query: |
+          query GetChapterComments ($chapter_id: Int!) {
+            social_activities(where: {_and:{ref_activity:{_is_null:true},chapter_id:{_eq:$chapter_id}}}, order_by: {created_at:desc}) {
+              id
+              social_activities_authorizer_user {
+                id
+                nickname
+              }
+              content
+              created_at
+              replies: social_activities(order_by: {created_at:asc}) {
+                social_activities_authorizer_user {
+                  id
+                  nickname
+                }
+                content
+                created_at
+              }
+            }
+          }
+      - name: User - Add comment in chapter
+        query: |
+          mutation AddUserComment ($chapter_id: Int = 21, $ref_activity: Int, $content: String = "") {
+            insert_social_activities_one(object: {chapter_id:$chapter_id,content:$content,ref_activity:$ref_activity}) {
+              id
+              content
+              user_id
+              ref_activity
+            }
+          }
diff --git a/src/chapter/chapter.service.ts b/src/chapter/chapter.service.ts
@@ -43,10 +43,6 @@ export class ChapterService {
       JSON.parse(data.chapter_images),
     );
 
-    const thumbnailFileName = files.filter(
-      (f) => f.fieldname === 'thumbnail',
-    )[0].originalname;
-
     const storageFolder = `./uploads/${userId}`;
     if (!existsSync(storageFolder)) {
       mkdirSync(storageFolder, { recursive: true });
@@ -56,15 +52,19 @@ export class ChapterService {
       writeFileSync(`./uploads/${userId}/${file.originalname}`, file.buffer);
     });
 
-    const thumbnailFile = await this.filesService.detectFile(
-      `./uploads/${userId}`,
-      thumbnailFileName,
-    );
-    const thumbnailUrl = await this.filesService.uploadThumbnailToS3(
-      manga_id,
-      chapter_number,
-      thumbnailFile,
-    );
+    let thumbnailUrl = '';
+    const thumbnail = files.filter((f) => f.fieldname === 'thumbnail')[0];
+    if (thumbnail) {
+      const thumbnailFile = await this.filesService.detectFile(
+        `./uploads/${userId}`,
+        thumbnail.originalname,
+      );
+      thumbnailUrl = await this.filesService.uploadThumbnailToS3(
+        manga_id,
+        chapter_number,
+        thumbnailFile,
+      );
+    }
 
     // insert chapter to DB
     const variables = {
@@ -106,7 +106,7 @@ export class ChapterService {
       userId,
       mangaId: manga_id,
       chapterNumber: chapter_number,
-      thumbnailPath: path.join(storageFolder, thumbnailFileName),
+      thumbnailPath: path.join(storageFolder, thumbnail.originalname),
       chapterImagePaths: chapter_images.chapter_languages.map((m: any) => ({
         languageId: m.language_id,
         filePath: path.join(storageFolder, m.file_name),

diff --git a/src/manga/manga.service.ts b/src/manga/manga.service.ts
@@ -67,17 +67,15 @@ export class MangaService {
 
     // upload files
     const mangaId = result.data.insert_manga_one.id;
+    let posterUrl = '';
+    let bannerUrl = '';
     const bannerFile = files.filter((f) => f.fieldname === 'banner')[0];
-    const bannerUrl = await this.filesService.uploadImageToS3(
-      mangaId,
-      bannerFile,
-    );
+    if (bannerFile)
+      bannerUrl = await this.filesService.uploadImageToS3(mangaId, bannerFile);
 
     const posterFile = files.filter((f) => f.fieldname === 'poster')[0];
-    const posterUrl = await this.filesService.uploadImageToS3(
-      mangaId,
-      posterFile,
-    );
+    if (bannerFile)
+      posterUrl = await this.filesService.uploadImageToS3(mangaId, posterFile);
 
     // update manga in DB
     const udpateVariables = {