Merge pull request #102 from ngyngcphu/fix/stat-uploaded-model-api

fix: uploaded model api now consider default models only
ngyngcphu · Dec 31, 2023 · 9b02c98 · 9b02c98
2 parents cb3b2d3 + dc6f818
commit 9b02c98
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/src/dtos/in/stat.dto.ts b/src/dtos/in/stat.dto.ts
@@ -13,7 +13,7 @@ export const JoinedUserStatQuerystringDto = Type.Object({
     interval: Type.Number({ minimum: 1, multipleOf: 1, default: 1, description: 'The length of a sub-interval' })
 });
 
-export const UploadedUserModelStatQuerystringDto = Type.Object({
+export const UploadedModelStatQuerystringDto = Type.Object({
     start: Type.String({ format: 'date', description: 'The start date of the interval' }),
     end: Type.String({ format: 'date', description: 'The end date of the interval' }),
     unit: Type.Union([Type.Literal('day'), Type.Literal('month')], {
@@ -37,6 +37,6 @@ export const RevenueStatQuerystringDto = Type.Object({
 
 export type RevenueStatQuerystringDto = Static<typeof RevenueStatQuerystringDto>;
 
-export type UploadedUserModelStatQuerystringDto = Static<typeof UploadedUserModelStatQuerystringDto>;
+export type UploadedModelStatQuerystringDto = Static<typeof UploadedModelStatQuerystringDto>;
 
 export type JoinedUserStatQuerystringDto = Static<typeof JoinedUserStatQuerystringDto>;
diff --git a/src/dtos/out/stat.dto.ts b/src/dtos/out/stat.dto.ts
@@ -19,7 +19,7 @@ export const JoinedUserStatResultDto = Type.Array(
     })
 );
 
-export const UploadedUserModelStatResultDto = Type.Array(
+export const UploadedModelStatResultDto = Type.Array(
     Type.Object({
         start: Type.String({ format: 'date' }),
         end: Type.String({ format: 'date' }),
@@ -37,7 +37,7 @@ export const RevenueStatResultDto = Type.Array(
 
 export type RevenueStatResultDto = Static<typeof RevenueStatResultDto>;
 
-export type UploadedUserModelStatResultDto = Static<typeof UploadedUserModelStatResultDto>;
+export type UploadedModelStatResultDto = Static<typeof UploadedModelStatResultDto>;
 
 export type JoinedUserStatResultDto = Static<typeof JoinedUserStatResultDto>;
 

diff --git a/src/handlers/stat.handler.ts b/src/handlers/stat.handler.ts
@@ -1,7 +1,7 @@
-import { CategoryStatResultDto, JoinedUserStatResultDto, RevenueStatResultDto, UploadedUserModelStatResultDto } from '@dtos/out';
+import { CategoryStatResultDto, JoinedUserStatResultDto, RevenueStatResultDto, UploadedModelStatResultDto } from '@dtos/out';
 import { Handler } from '@interfaces';
 import { prisma } from '@repositories';
-import { JoinedUserStatQuerystringDto, RevenueStatQuerystringDto, UploadedUserModelStatQuerystringDto } from 'src/dtos/in/stat.dto';
+import { JoinedUserStatQuerystringDto, RevenueStatQuerystringDto, UploadedModelStatQuerystringDto } from 'src/dtos/in/stat.dto';
 
 const noByCategory: Handler<CategoryStatResultDto> = async () => {
     const cats = await prisma.defaultModel.groupBy({
@@ -79,14 +79,12 @@ const joinedUsers: Handler<JoinedUserStatResultDto, { Querystring: JoinedUserSta
     }));
 };
 
-const uploadedUserModelCount: Handler<UploadedUserModelStatResultDto, { Querystring: UploadedUserModelStatQuerystringDto }> = async (
-    req
-) => {
+const uploadedUserModelCount: Handler<UploadedModelStatResultDto, { Querystring: UploadedModelStatQuerystringDto }> = async (req) => {
     const { start: _start, end: _end, interval, unit } = req.query;
     const start = new Date(_start);
     const end = new Date(_end);
 
-    const newModels = await prisma.uploadedModel.findMany({
+    const newModels = await prisma.defaultModel.findMany({
         select: {
             model: {
                 select: {

diff --git a/src/routes/apis/stat.plugin.ts b/src/routes/apis/stat.plugin.ts
@@ -1,5 +1,5 @@
-import { JoinedUserStatQuerystringDto, RevenueStatQuerystringDto, UploadedUserModelStatQuerystringDto } from '@dtos/in';
-import { CategoryStatResultDto, JoinedUserStatResultDto, RevenueStatResultDto, UploadedUserModelStatResultDto } from '@dtos/out';
+import { JoinedUserStatQuerystringDto, RevenueStatQuerystringDto, UploadedModelStatQuerystringDto } from '@dtos/in';
+import { CategoryStatResultDto, JoinedUserStatResultDto, RevenueStatResultDto, UploadedModelStatResultDto } from '@dtos/out';
 import { statHandler } from '@handlers';
 import { verifyToken, verifyUserRole } from '@hooks';
 import { UserRole } from '@prisma/client';
@@ -49,10 +49,10 @@ export const statPlugin = createRoutes('Stat', [
         url: '/userModel',
         onRequest: [verifyToken, verifyUserRole(UserRole.MANAGER)],
         schema: {
-            summary: 'Summarize the total uploaded user models in a given interval',
-            querystring: UploadedUserModelStatQuerystringDto,
+            summary: 'Summarize the total uploaded default models in a given interval',
+            querystring: UploadedModelStatQuerystringDto,
             response: {
-                200: UploadedUserModelStatResultDto
+                200: UploadedModelStatResultDto
             }
         },
         handler: statHandler.uploadedUserModelCount