diff --git a/src/dtos/in/stat.dto.ts b/src/dtos/in/stat.dto.ts index 7d56cdc..75f9cb9 100644 --- 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; -export type UploadedUserModelStatQuerystringDto = Static; +export type UploadedModelStatQuerystringDto = Static; export type JoinedUserStatQuerystringDto = Static; diff --git a/src/dtos/out/stat.dto.ts b/src/dtos/out/stat.dto.ts index 1aa5cca..cf7f0de 100644 --- 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; -export type UploadedUserModelStatResultDto = Static; +export type UploadedModelStatResultDto = Static; export type JoinedUserStatResultDto = Static; diff --git a/src/handlers/stat.handler.ts b/src/handlers/stat.handler.ts index 8efefd0..ff66cc3 100644 --- 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 = async () => { const cats = await prisma.defaultModel.groupBy({ @@ -79,14 +79,12 @@ const joinedUsers: Handler = async ( - req -) => { +const uploadedUserModelCount: Handler = 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 index 706021f..6729e0d 100644 --- 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