Merge pull request #363 from internxt/fix/overlapped-route-changed-an…

…d-types [_] fix: change type in repository and modify route name
internxt · Jul 16, 2024 · b87275e · b87275e
2 parents 2e336ca + 248acee
commit b87275e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/modules/file/file.repository.spec.ts b/src/modules/file/file.repository.spec.ts
@@ -57,7 +57,7 @@ describe('FileRepository', () => {
             where: expect.objectContaining({
               createdBy: user.uuid,
               workspaceId: workspace.id,
-              created_at: { [Op.gte]: options.createdFrom },
+              createdAt: { [Op.gte]: options.createdFrom },
             }),
           }),
         }),
@@ -87,7 +87,7 @@ describe('FileRepository', () => {
         expect.objectContaining({
           where: expect.objectContaining({
             [Op.or]: expect.arrayContaining([{ status: statuses[0] }]),
-            removed_at: { [Op.gte]: options.removedFrom },
+            removedAt: { [Op.gte]: options.removedFrom },
           }),
         }),
       );

diff --git a/src/modules/file/file.repository.ts b/src/modules/file/file.repository.ts
@@ -326,16 +326,16 @@ export class SequelizeFileRepository implements FileRepository {
   ): Promise<{ size: string }[]> {
     const statusesFilter = statuses.map((value) => ({ status: value }));
 
-    const fileDateFilters: any = {};
+    const fileDateFilters: WhereOptions<FileModel> = {};
     if (options?.removedFrom) {
-      fileDateFilters.removed_at = {
+      fileDateFilters.removedAt = {
         [Op.gte]: options?.removedFrom,
       };
     }
 
-    const workspaceItemDateFilters: any = {};
+    const workspaceItemDateFilters: WhereOptions<WorkspaceItemUserModel> = {};
     if (options?.createdFrom) {
-      workspaceItemDateFilters.created_at = {
+      workspaceItemDateFilters.createdAt = {
         [Op.gte]: options.createdFrom,
       };
     }

diff --git a/src/modules/workspaces/workspaces.controller.ts b/src/modules/workspaces/workspaces.controller.ts
@@ -518,7 +518,7 @@ export class WorkspacesController {
     return this.workspaceUseCases.getWorkspaceTeams(user, workspaceId);
   }
 
-  @Get('/:workspaceId/usage')
+  @Get('/:workspaceId/usage/member')
   @ApiOperation({
     summary: 'User usage in drive',
   })