fix(worker): return wrong resource id

yjl9903 · Oct 7, 2023 · b95167d · b95167d
1 parent f7014d3
commit b95167d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/packages/worker/scripts/dev.http b/packages/worker/scripts/dev.http
@@ -14,6 +14,10 @@ Content-Type: application/json
 GET http://127.0.0.1:8787/resource/638270_Nemuri_THE_iDOLM_STER_CINDERELLA_GIRLS_2012-2023_Discography_Collection_268_CDs_FLAC.html
 Content-Type: application/json
 
+### Get the resource detail by id
+GET http://127.0.0.1:8787/resource/652885
+Content-Type: application/json
+
 ### List the second page of resources
 GET http://127.0.0.1:8787/resources?page=2
 Content-Type: application/json

diff --git a/packages/worker/src/query.ts b/packages/worker/src/query.ts
@@ -87,12 +87,25 @@ export const findResourcesFromDB = memoAsync(
 
     const query = db
       .selectFrom('Resource')
-      .selectAll()
+      .select([
+        'Resource.id',
+        'Resource.href',
+        'Resource.title',
+        'Resource.titleAlt',
+        'Resource.type',
+        'Resource.size',
+        'Resource.magnet',
+        'Resource.createdAt',
+        'Resource.anitomy',
+        'Resource.fansubId',
+        'Resource.publisherId',
+        'Resource.isDeleted'
+      ])
       .leftJoin('User', 'Resource.publisherId', 'User.id')
       .leftJoin('Team', 'Resource.fansubId', 'Team.id')
       .select('User.name as publisherName')
       .select('Team.name as fansubName')
-      .where(({ and, or, not, eb }) =>
+      .where(({ and, or, eb }) =>
         and(
           [
             eb('Resource.isDeleted', '=', 0),

diff --git a/scripts/api.http b/scripts/api.http
@@ -7,7 +7,7 @@ GET https://garden.onekuma.cn/api/resource/638270_Nemuri_THE_iDOLM_STER_CINDEREL
 Content-Type: application/json
 
 ### Get the resource detail by id
-GET https://garden.onekuma.cn/api/resource/638270
+GET https://garden.onekuma.cn/api/resource/652885
 Content-Type: application/json
 
 ### List the second page of resources