feat(FilesCountInfoIntegration): rename some methods

IQSS · Sep 6, 2023 · 3265f55 · 3265f55
1 parent 00ef077
commit 3265f55
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 75 deletions.
diff --git a/src/files/domain/repositories/FileRepository.ts b/src/files/domain/repositories/FileRepository.ts
@@ -12,9 +12,9 @@ export interface FileRepository {
     paginationInfo?: FilePaginationInfo,
     criteria?: FileCriteria
   ) => Promise<File[]>
-  getCountInfoByDatasetPersistentId: (
+  getFilesCountInfoByDatasetPersistentId: (
     datasetPersistentId: string,
     datasetVersion: DatasetVersion
   ) => Promise<FilesCountInfo>
-  getFileUserPermissionsById: (id: number) => Promise<FileUserPermissions>
+  getUserPermissionsById: (id: number) => Promise<FileUserPermissions>
 }
diff --git a/src/files/domain/useCases/checkFileDownloadPermission.ts b/src/files/domain/useCases/checkFileDownloadPermission.ts
@@ -6,7 +6,7 @@ export async function checkFileDownloadPermission(
   file: File
 ): Promise<boolean> {
   if (file.version.publishingStatus === FilePublishingStatus.DEACCESSIONED) {
-    return fileRepository.getFileUserPermissionsById(file.id).then((permissions) => {
+    return fileRepository.getUserPermissionsById(file.id).then((permissions) => {
       return permissions.canEditDataset
     })
   }
@@ -16,7 +16,7 @@ export async function checkFileDownloadPermission(
     return true
   }
 
-  return fileRepository.getFileUserPermissionsById(file.id).then((permissions) => {
+  return fileRepository.getUserPermissionsById(file.id).then((permissions) => {
     return permissions.canDownloadFile
   })
 }
diff --git a/src/files/domain/useCases/checkFileEditDatasetPermission.ts b/src/files/domain/useCases/checkFileEditDatasetPermission.ts
@@ -5,7 +5,7 @@ export async function checkFileEditDatasetPermission(
   fileRepository: FileRepository,
   file: File
 ): Promise<boolean> {
-  return fileRepository.getFileUserPermissionsById(file.id).then((permissions) => {
+  return fileRepository.getUserPermissionsById(file.id).then((permissions) => {
     return permissions.canEditDataset
   })
 }
diff --git a/src/files/domain/useCases/getFilesCountInfoByDatasetPersistentId.ts b/src/files/domain/useCases/getFilesCountInfoByDatasetPersistentId.ts
@@ -8,7 +8,7 @@ export async function getFilesCountInfoByDatasetPersistentId(
   datasetVersion: DatasetVersion
 ): Promise<FilesCountInfo> {
   return fileRepository
-    .getCountInfoByDatasetPersistentId(datasetPersistentId, datasetVersion)
+    .getFilesCountInfoByDatasetPersistentId(datasetPersistentId, datasetVersion)
     .catch((error: Error) => {
       throw new Error(error.message)
     })

diff --git a/src/files/infrastructure/FileJSDataverseRepository.ts b/src/files/infrastructure/FileJSDataverseRepository.ts
@@ -63,7 +63,7 @@ export class FileJSDataverseRepository implements FileRepository {
     return Promise.resolve(0)
   }
 
-  getCountInfoByDatasetPersistentId(
+  getFilesCountInfoByDatasetPersistentId(
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
@@ -77,7 +77,7 @@ export class FileJSDataverseRepository implements FileRepository {
     })
   }
 
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return getFileUserPermissions
       .execute(id)
       .then((jsFileUserPermissions) =>

diff --git a/src/stories/files/FileMockLoadingRepository.ts b/src/stories/files/FileMockLoadingRepository.ts
@@ -19,7 +19,7 @@ export class FileMockLoadingRepository implements FileRepository {
     })
   }
 
-  getCountInfoByDatasetPersistentId(
+  getFilesCountInfoByDatasetPersistentId(
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
@@ -32,7 +32,7 @@ export class FileMockLoadingRepository implements FileRepository {
     })
   }
   // eslint-disable-next-line unused-imports/no-unused-vars
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FileUserPermissionsMother.create())

diff --git a/src/stories/files/FileMockNoDataRepository.ts b/src/stories/files/FileMockNoDataRepository.ts
@@ -20,7 +20,7 @@ export class FileMockNoDataRepository implements FileRepository {
     })
   }
 
-  getCountInfoByDatasetPersistentId(
+  getFilesCountInfoByDatasetPersistentId(
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
@@ -33,7 +33,7 @@ export class FileMockNoDataRepository implements FileRepository {
     })
   }
   // eslint-disable-next-line unused-imports/no-unused-vars
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FileUserPermissionsMother.create())

diff --git a/src/stories/files/FileMockNoFiltersRepository.ts b/src/stories/files/FileMockNoFiltersRepository.ts
@@ -21,7 +21,7 @@ export class FileMockNoFiltersRepository implements FileRepository {
     })
   }
 
-  getCountInfoByDatasetPersistentId(
+  getFilesCountInfoByDatasetPersistentId(
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
@@ -34,7 +34,7 @@ export class FileMockNoFiltersRepository implements FileRepository {
     })
   }
   // eslint-disable-next-line unused-imports/no-unused-vars
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FileUserPermissionsMother.create())

diff --git a/src/stories/files/FileMockRepository.ts b/src/stories/files/FileMockRepository.ts
@@ -22,7 +22,7 @@ export class FileMockRepository implements FileRepository {
     })
   }
 
-  getCountInfoByDatasetPersistentId(
+  getFilesCountInfoByDatasetPersistentId(
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
@@ -35,7 +35,7 @@ export class FileMockRepository implements FileRepository {
     })
   }
   // eslint-disable-next-line unused-imports/no-unused-vars
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FileUserPermissionsMother.create())

diff --git a/src/stories/files/FileWithDeniedPermissionsRepository.ts b/src/stories/files/FileWithDeniedPermissionsRepository.ts
@@ -8,7 +8,7 @@ export class FileWithDeniedPermissionsRepository
   implements FileRepository
 {
   // eslint-disable-next-line unused-imports/no-unused-vars
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FileUserPermissionsMother.createWithDeniedPermissions())

diff --git a/src/stories/files/FileWithGrantedPermissionsRepository.ts b/src/stories/files/FileWithGrantedPermissionsRepository.ts
@@ -8,7 +8,7 @@ export class FileWithGrantedPermissionsRepository
   implements FileRepository
 {
   // eslint-disable-next-line unused-imports/no-unused-vars
-  getFileUserPermissionsById(id: number): Promise<FileUserPermissions> {
+  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FileUserPermissionsMother.createWithGrantedPermissions())

diff --git a/tests/component/sections/dataset/dataset-files/DatasetFiles.spec.tsx b/tests/component/sections/dataset/dataset-files/DatasetFiles.spec.tsx
@@ -42,7 +42,7 @@ const filePaginationInfo = new FilePaginationInfo(1, 10, 200)
 describe('DatasetFiles', () => {
   beforeEach(() => {
     fileRepository.getAllByDatasetPersistentId = cy.stub().resolves(testFiles)
-    fileRepository.getCountInfoByDatasetPersistentId = cy.stub().resolves(testFilesCountInfo)
+    fileRepository.getFilesCountInfoByDatasetPersistentId = cy.stub().resolves(testFilesCountInfo)
   })
 
   it('renders the files table', () => {
@@ -180,7 +180,7 @@ describe('DatasetFiles', () => {
         datasetVersion
       )
 
-      cy.wrap(fileRepository.getCountInfoByDatasetPersistentId).should(
+      cy.wrap(fileRepository.getFilesCountInfoByDatasetPersistentId).should(
         'be.calledWith',
         datasetPersistentId,
         datasetVersion

diff --git a/...ponent/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx b/...ponent/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
@@ -15,7 +15,7 @@ describe('FileActionsHeader', () => {
     userRepository.removeAuthenticated = cy.stub().resolves()
     const files = FileMother.createMany(2)
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: files[0].id,
         canEditDataset: true

diff --git a/...ons/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx b/...ons/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
@@ -15,7 +15,7 @@ describe('EditFilesMenu', () => {
   beforeEach(() => {
     userRepository.getAuthenticated = cy.stub().resolves(user)
     userRepository.removeAuthenticated = cy.stub().resolves()
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: files[0].id,
         canEditDataset: true
@@ -74,7 +74,7 @@ describe('EditFilesMenu', () => {
   })
 
   it.skip('does not render the Edit Files menu when the user does not have update dataset permissions', () => {
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: files[0].id,
         canEditDataset: false

diff --git a/...files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.spec.tsx b/...files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.spec.tsx
@@ -22,7 +22,7 @@ describe('FileActionButtons', () => {
     userRepository.getAuthenticated = cy.stub().resolves(user)
     userRepository.removeAuthenticated = cy.stub().resolves()
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
         canEditDataset: true

diff --git a/...file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.spec.tsx b/...file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.spec.tsx
@@ -25,7 +25,7 @@ describe('AccessStatus', () => {
   it('renders the access status restricted with access', () => {
     const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: fileRestrictedWithAccess.id,
         canDownloadFile: true
@@ -47,7 +47,7 @@ describe('AccessStatus', () => {
   it('renders the access status embargoed', () => {
     const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: fileRestrictedWithAccess.id,
         canDownloadFile: true
@@ -75,7 +75,7 @@ describe('AccessStatus', () => {
   it('renders the access status embargoed restricted with access', () => {
     const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: fileRestrictedWithAccess.id,
         canDownloadFile: true

diff --git a/...tions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.spec.tsx b/...tions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.spec.tsx
@@ -69,7 +69,7 @@ describe('RequestAccessOption', () => {
   it('does not render the request access button when the file status is public', () => {
     const filePublic = FileMother.createWithPublicAccess()
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: filePublic.id,
         canDownloadFile: true
@@ -96,7 +96,7 @@ describe('RequestAccessOption', () => {
   it('does not render the request access button when the file status is restricted with access granted', () => {
     const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: fileRestrictedWithAccess.id,
         canDownloadFile: true

diff --git a/...-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.spec.tsx b/...-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.spec.tsx
@@ -15,7 +15,7 @@ describe('FileOptionsMenu', () => {
   beforeEach(() => {
     userRepository.getAuthenticated = cy.stub().resolves(user)
     userRepository.removeAuthenticated = cy.stub().resolves()
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
         canEditDataset: true
@@ -71,7 +71,7 @@ describe('FileOptionsMenu', () => {
   })
 
   it('does not render is the user do not have permissions to update the dataset', () => {
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
         canEditDataset: false

diff --git a/...iles-table/files-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.spec.tsx b/...iles-table/files-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.spec.tsx
@@ -8,7 +8,7 @@ const fileRepository: FileRepository = {} as FileRepository
 describe('FileThumbnail', () => {
   it('renders FileThumbnailPreviewImage when thumbnail is provided and file can be downloaded', () => {
     const file = FileMother.createWithThumbnail()
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
         canDownloadFile: true
@@ -40,7 +40,7 @@ describe('FileThumbnail', () => {
 
   it('renders FileThumbnailPreviewImage when thumbnail is provided with unlocked icon if restricted with access', () => {
     const file = FileMother.createWithThumbnailRestrictedWithAccessGranted()
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
         canDownloadFile: true
@@ -101,7 +101,7 @@ describe('FileThumbnail', () => {
 
   it('renders FileThumbnailIcon when thumbnail is not provided with unlock icon when restricted with access', () => {
     const file = FileMother.createWithRestrictedAccessWithAccessGranted()
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
         canDownloadFile: true

diff --git a/tests/component/sections/dataset/dataset-files/useFiles.spec.tsx b/tests/component/sections/dataset/dataset-files/useFiles.spec.tsx
@@ -51,8 +51,8 @@ const FilesTableTestComponent = ({ datasetPersistentId }: { datasetPersistentId:
 describe('useFiles', () => {
   beforeEach(() => {
     fileRepository.getAllByDatasetPersistentId = cy.stub().resolves(files)
-    fileRepository.getCountInfoByDatasetPersistentId = cy.stub().resolves(filesCountInfo)
-    fileRepository.getFileUserPermissionsById = cy
+    fileRepository.getFilesCountInfoByDatasetPersistentId = cy.stub().resolves(filesCountInfo)
+    fileRepository.getUserPermissionsById = cy
       .stub()
       .resolves(FileUserPermissionsMother.create({ fileId: files[0].id }))
   })
@@ -80,7 +80,7 @@ describe('useFiles', () => {
     cy.customMount(<FilesTableTestComponent datasetPersistentId="persistentId" />)
 
     cy.findByText('Loading...').should('exist')
-    cy.wrap(fileRepository.getCountInfoByDatasetPersistentId).should(
+    cy.wrap(fileRepository.getFilesCountInfoByDatasetPersistentId).should(
       'be.calledOnceWith',
       'persistentId'
     )
@@ -98,7 +98,7 @@ describe('useFiles', () => {
   it('calls the file repository to get the permissions before removing the loading', () => {
     const files = FileMother.createMany(5)
     fileRepository.getAllByDatasetPersistentId = cy.stub().resolves(files)
-    fileRepository.getFileUserPermissionsById = cy.stub().resolves(
+    fileRepository.getUserPermissionsById = cy.stub().resolves(
       new Promise((resolve) => {
         setTimeout(() => {
           resolve(FileUserPermissionsMother.create({ fileId: files[0].id }))
@@ -116,14 +116,14 @@ describe('useFiles', () => {
     cy.wrap(fileRepository.getAllByDatasetPersistentId).should('be.calledOnceWith', 'persistentId')
 
     cy.findByText('Loading...').should('exist')
-    cy.wrap(fileRepository.getFileUserPermissionsById).should('be.calledWith', files[0].id)
+    cy.wrap(fileRepository.getUserPermissionsById).should('be.calledWith', files[0].id)
 
     cy.findByText('Loading...').should('exist')
     cy.findByText('Files count: 100').should('exist')
   })
 
   it('calls the file repository to get the files only if files count info is greater than 0', () => {
-    fileRepository.getCountInfoByDatasetPersistentId = cy
+    fileRepository.getFilesCountInfoByDatasetPersistentId = cy
       .stub()
       .resolves(FilesCountInfoMother.create({ total: 0 }))
 

diff --git a/tests/component/sections/file/file-permissions/useFileDownloadPermission.spec.tsx b/tests/component/sections/file/file-permissions/useFileDownloadPermission.spec.tsx
@@ -24,14 +24,14 @@ function TestComponent({ file }: { file: File }) {
 describe('useFileDownloadPermission', () => {
   beforeEach(() => {
     fileRepository.getAllByDatasetPersistentId = cy.stub().resolves([])
-    fileRepository.getCountInfoByDatasetPersistentId = cy
+    fileRepository.getFilesCountInfoByDatasetPersistentId = cy
       .stub()
       .resolves(FilesCountInfoMother.create())
   })
 
   it('should return file download permission', () => {
     const file = FileMother.createDeaccessioned()
-    fileRepository.getFileUserPermissionsById = cy
+    fileRepository.getUserPermissionsById = cy
       .stub()
       .resolves(FileUserPermissionsMother.create({ fileId: file.id, canEditDataset: true }))
 
@@ -41,13 +41,13 @@ describe('useFileDownloadPermission', () => {
       </FilePermissionsProvider>
     )
 
-    cy.wrap(fileRepository.getFileUserPermissionsById).should('be.calledWith', file.id)
+    cy.wrap(fileRepository.getUserPermissionsById).should('be.calledWith', file.id)
     cy.findByText('Has download permission').should('exist')
   })
 
   it('should return false for file download permission if there is an error', () => {
     const file = FileMother.createDeaccessioned()
-    fileRepository.getFileUserPermissionsById = cy
+    fileRepository.getUserPermissionsById = cy
       .stub()
       .rejects(new Error('Error getting file user permissions'))
 
@@ -57,7 +57,7 @@ describe('useFileDownloadPermission', () => {
       </FilePermissionsProvider>
     )
 
-    cy.wrap(fileRepository.getFileUserPermissionsById).should('be.calledWith', file.id)
+    cy.wrap(fileRepository.getUserPermissionsById).should('be.calledWith', file.id)
     cy.findByText('Does not have download permission').should('exist')
   })
 })