Feature/new attachments api

README.md

@@ -188,5 +188,9 @@ The tests are colocated in their respective feature. For example, if we have a `
 ## TODO
 
 - [ ] Switch to Vitest
-- [ ] Review commented out lint rules
 - [ ] Review use of any
+- [ ] Review use of `as`
+- [ ] Review use of `!`
+- [ ] Review use of `@ts-ignore`
+- [ ] Review use of `eslint-disable`
+- [ ] Switch to Zod

src/app-providers.tsx

@@ -4,13 +4,15 @@ import { GlobalErrorBoundary } from './shared/components/global-error-boundary'
 import { TntChakraProvider } from './shared/providers/tnt-chakra-provider'
 import { AuthProvider } from './shared/contexts/auth-context'
 import { PropsWithChildren } from 'react'
+import { useTranslation } from 'react-i18next'
 
 export const AppProviders: FC<PropsWithChildren> = (props) => {
+  const { t } = useTranslation()
   return (
     <BrowserRouter basename={'tnt'}>
       <AuthProvider>
         <TntChakraProvider>
-          <GlobalErrorBoundary>{props.children}</GlobalErrorBoundary>
+          <GlobalErrorBoundary t={t}>{props.children}</GlobalErrorBoundary>
         </TntChakraProvider>
       </AuthProvider>
     </BrowserRouter>

src/app-routes.tsx

@@ -1,4 +1,4 @@
-import { LogoutCmd } from './features/auth/application/logout-cmd'
+import { LogoutCmd } from './features/auth/application/logout.cmd'
 import { LazyLoginPage } from './features/auth/ui/login-page.lazy'
 import { LazyCalendarDesktop } from './features/binnacle/features/activity/ui/calendar-desktop/calendar-desktop.lazy'
 import { LazyCalendarMobile } from './features/binnacle/features/activity/ui/calendar-mobile/calendar-mobile.lazy'

src/features/administration/features/project/application/block-project-cmd.test.ts → src/features/administration/features/project/application/block-project.cmd.test.ts

@@ -1,5 +1,5 @@
 import { mock } from 'jest-mock-extended'
-import { BlockProjectCmd } from './block-project-cmd'
+import { BlockProjectCmd } from './block-project.cmd'
 import { ProjectRepository } from '../../../../shared/project/domain/project-repository'
 
 describe('BlockProjectCmd', () => {

src/features/administration/features/project/application/unblock-project-cmd.test.ts → src/features/administration/features/project/application/unblock-project.cmd.test.ts

@@ -1,6 +1,6 @@
 import { mock } from 'jest-mock-extended'
-import { UnblockProjectCmd } from './unblock-project-cmd'
 import { ProjectRepository } from '../../../../shared/project/domain/project-repository'
+import { UnblockProjectCmd } from './unblock-project.cmd'
 
 describe('UnblockProjectCmd', () => {
   it('should unblock a project', async () => {

src/features/administration/features/project/ui/components/block-project-modal.tsx

@@ -18,7 +18,7 @@ import { SubmitButton } from '../../../../../../shared/components/form-fields/su
 import { useResolve } from '../../../../../../shared/di/use-resolve'
 import { DateField } from '../../../../../../shared/components/form-fields/date-field'
 import { chrono, parseISO } from '../../../../../../shared/utils/chrono'
-import { BlockProjectCmd } from '../../application/block-project-cmd'
+import { BlockProjectCmd } from '../../application/block-project.cmd'
 import { ProjectModalFormSchema, ProjectModalFormValidationSchema } from './project-modal.schema'
 import { useIsMobile } from '../../../../../../shared/hooks/use-is-mobile'
 import { Project } from '../../../../../shared/project/domain/project'

src/features/administration/features/project/ui/components/projects-table.tsx

@@ -6,9 +6,9 @@ import { useExecuteUseCaseOnMount } from '../../../../../../shared/arch/hooks/us
 import { useSubscribeToUseCase } from '../../../../../../shared/arch/hooks/use-subscribe-to-use-case'
 import { Table } from '../../../../../../shared/components/table/table'
 import { ColumnsProps } from '../../../../../../shared/components/table/table.types'
-import { BlockProjectCmd } from '../../application/block-project-cmd'
+import { BlockProjectCmd } from '../../application/block-project.cmd'
 import { GetProjectsWithBlockerUserName } from '../../application/get-projects-with-blocker-user-name'
-import { UnblockProjectCmd } from '../../application/unblock-project-cmd'
+import { UnblockProjectCmd } from '../../application/unblock-project.cmd'
 import { ProjectStatus } from '../../domain/project-status'
 import { AdaptedProjects, adaptProjectsToTable } from '../projects-page-utils'
 import { ProjectsFilterFormCombos } from './combos/projects-combos'

src/features/administration/features/project/ui/components/unblock-project-modal.tsx

@@ -14,7 +14,7 @@ import { FC } from 'react'
 import { useGetUseCase } from '../../../../../../shared/arch/hooks/use-get-use-case'
 import { useResolve } from '../../../../../../shared/di/use-resolve'
 import { useIsMobile } from '../../../../../../shared/hooks/use-is-mobile'
-import { UnblockProjectCmd } from '../../application/unblock-project-cmd'
+import { UnblockProjectCmd } from '../../application/unblock-project.cmd'
 import { Project } from '../../../../../shared/project/domain/project'
 import { ProjectErrorMessage } from '../../../../../shared/project/domain/services/project-error-message'
 

src/features/auth/application/logout-cmd.test.ts → src/features/auth/application/logout.cmd.test.ts

@@ -1,6 +1,6 @@
 import { mock } from 'jest-mock-extended'
 import { AuthRepository } from '../domain/auth-repository'
-import { LogoutCmd } from './logout-cmd'
+import { LogoutCmd } from './logout.cmd'
 
 describe('LogoutCmd', () => {
   it('should execute logout using the repository', async () => {

src/features/binnacle/features/activity/application/approve-activity-cmd.test.ts → src/features/binnacle/features/activity/application/approve-activity.cmd.test.ts

@@ -1,6 +1,6 @@
 import { mock } from 'jest-mock-extended'
 import { ActivityRepository } from '../domain/activity-repository'
-import { ApproveActivityCmd } from './approve-activity-cmd'
+import { ApproveActivityCmd } from './approve-activity.cmd'
 
 describe('ApproveActivityCmd', () => {
   it('should approve an activity', async () => {

src/features/binnacle/features/activity/application/create-activity-cmd.test.ts → src/features/binnacle/features/activity/application/create-activity.cmd.test.ts

@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { ActivityRepository } from '../domain/activity-repository'
 import { NewActivity } from '../domain/new-activity'
-import { CreateActivityCmd } from './create-activity-cmd'
+import { CreateActivityCmd } from './create-activity.cmd'
 
 describe('CreateActivityCmd', () => {
   it('should create a new activity', async () => {
@@ -18,14 +18,13 @@ function setup() {
 
   const newActivity: NewActivity = {
     description: 'any-description',
+    evidences: ['foo'],
     billable: true,
     interval: {
       start: new Date('2000-03-01T09:00:00.000Z'),
       end: new Date('2000-03-01T13:00:00.000Z')
     },
-    projectRoleId: 1,
-    evidence: undefined,
-    hasEvidences: false
+    projectRoleId: 1
   }
 
   return {

src/features/binnacle/features/activity/application/delete-activity-cmd.test.ts → src/features/binnacle/features/activity/application/delete-activity.cmd.test.ts

@@ -1,6 +1,6 @@
 import { mock } from 'jest-mock-extended'
 import { ActivityRepository } from '../domain/activity-repository'
-import { DeleteActivityCmd } from './delete-activity-cmd'
+import { DeleteActivityCmd } from './delete-activity.cmd'
 
 describe('DeleteActivityCmd', () => {
   it('should delete an activity by id', async () => {

src/features/binnacle/features/activity/application/get-activity-evidence-qry.test.ts

@@ -0,0 +1,23 @@
+import { mock } from 'jest-mock-extended'
+import { GetActivityEvidenceQry } from './get-activity-evidence-qry'
+import { HttpAttachmentRepository } from '../../attachments/infrastructure/http-attachment-repository'
+
+describe('GetActivityEvidenceQry', () => {
+  it('should get an activity image by id', async () => {
+    const { getActivityImageQry, urlToFileConverter } = setup()
+    const id = 'foo'
+
+    await getActivityImageQry.internalExecute(id)
+
+    expect(urlToFileConverter.getAttachment).toBeCalledWith(id)
+  })
+})
+
+function setup() {
+  const httpAttachmentRepository = mock<HttpAttachmentRepository>()
+
+  return {
+    getActivityImageQry: new GetActivityEvidenceQry(httpAttachmentRepository),
+    urlToFileConverter: httpAttachmentRepository
+  }
+}

src/features/binnacle/features/activity/application/get-activity-evidence-qry.ts

@@ -0,0 +1,16 @@
+import { Query, UseCaseKey } from '@archimedes/arch'
+import { singleton } from 'tsyringe'
+import { HttpAttachmentRepository } from '../../attachments/infrastructure/http-attachment-repository'
+import { Uuid } from '../../../../../shared/types/uuid'
+
+@UseCaseKey('GetActivityEvidenceQry')
+@singleton()
+export class GetActivityEvidenceQry extends Query<File, Uuid> {
+  constructor(private readonly httpAttachmentRepository: HttpAttachmentRepository) {
+    super()
+  }
+
+  async internalExecute(uuid: Uuid): Promise<File> {
+    return this.httpAttachmentRepository.getAttachment(uuid)
+  }
+}

src/features/binnacle/features/activity/application/update-activity-cmd.test.ts → src/features/binnacle/features/activity/application/update-activity.cmd.test.ts

@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { ActivityRepository } from '../domain/activity-repository'
 import { UpdateActivity } from '../domain/update-activity'
-import { UpdateActivityCmd } from './update-activity-cmd'
+import { UpdateActivityCmd } from './update-activity.cmd'
 
 describe('UpdateActivityCmd', () => {
   it('should update the activity correctly', async () => {
@@ -19,14 +19,13 @@ function setup() {
   const updateActivity: UpdateActivity = {
     id: 1,
     description: 'Minutes activity',
+    evidences: ['foo'],
     billable: true,
     interval: {
       start: new Date('2023-03-01T09:00:00.000Z'),
       end: new Date('2023-03-01T13:00:00.000Z')
     },
-    projectRoleId: 1,
-    evidence: undefined,
-    hasEvidences: false
+    projectRoleId: 1
   }
 
   return {

src/features/binnacle/features/activity/domain/activity-code-errors.ts

@@ -8,6 +8,5 @@ export const ActivityCodeErrors = {
   MAX_REGISTRABLE_TIME_PER_ACTIVITY_LIMIT_EXCEEDED:
     'MAX_REGISTRABLE_TIME_PER_ACTIVITY_LIMIT_EXCEEDED',
   INVALID_ACTIVITY_APPROVAL_STATE: 'INVALID_ACTIVITY_APPROVAL_STATE',
-  BLOCKED_PROJECT: 'BLOCKED_PROJECT',
-  ILLEGAL_ARGUMENT: 'ILLEGAL_ARGUMENT'
+  BLOCKED_PROJECT: 'BLOCKED_PROJECT'
 } as const

src/features/binnacle/features/activity/domain/activity-repository.ts

@@ -14,8 +14,6 @@ export interface ActivityRepository {
     queryParams: GetActivitiesQueryParams
   ): Promise<ActivityWithProjectRoleId[]>
 
-  getActivityEvidence(activityId: Id): Promise<File>
-
   getActivitySummary(interval: DateInterval): Promise<ActivityDaySummary[]>
 
   create(newActivity: NewActivity): Promise<ActivityWithProjectRoleId>

src/features/binnacle/features/activity/domain/activity.ts

@@ -4,17 +4,22 @@ import { LiteProjectRoleWithProjectId } from '../../search/domain/lite-project-r
 import { LiteProjectWithOrganizationId } from '../../search/domain/lite-project-with-organization-id'
 import { ActivityInterval } from './activity-interval'
 import { ActivityApproval } from './activity-approval'
+import { Uuid } from '../../../../../shared/types/uuid'
 
 export interface Activity {
   id: Id
   description: string
   userId: Id
   billable: boolean
-  hasEvidences: boolean
+  evidences: Uuid[]
   organization: Organization
   project: LiteProjectWithOrganizationId
   projectRole: LiteProjectRoleWithProjectId
   approval: ActivityApproval
   interval: ActivityInterval
   userName?: string
 }
+
+export function hasEvidence(activity: Activity): boolean {
+  return activity.evidences.length > 0
+}

src/features/binnacle/features/activity/domain/new-activity.ts

@@ -3,8 +3,7 @@ import { ActivityWithProjectRoleId } from './activity-with-project-role-id'
 
 export type NewActivity = Pick<
   ActivityWithProjectRoleId,
-  'description' | 'billable' | 'projectRoleId' | 'hasEvidences'
+  'description' | 'billable' | 'projectRoleId' | 'evidences'
 > & {
   interval: DateInterval
-  evidence?: File
 }

src/features/binnacle/features/activity/domain/services/activity-error-message.ts

@@ -20,8 +20,7 @@ const ActivityErrorTitles: Record<ActivityCodeError, string> = {
   MAX_REGISTRABLE_TIME_PER_ACTIVITY_LIMIT_EXCEEDED:
     'activity_api_errors.max_registrable_time_per_activity_limit_title',
   INVALID_ACTIVITY_APPROVAL_STATE: 'activity_api_errors.invalid_activity_approval_state_title',
-  BLOCKED_PROJECT: 'activity_api_errors.blocked_project',
-  ILLEGAL_ARGUMENT: 'activity_api_errors.invalid_file_format_title'
+  BLOCKED_PROJECT: 'activity_api_errors.blocked_project'
 }
 
 const ActivityErrorDescriptions: Record<ActivityCodeError, string> = {
@@ -36,8 +35,7 @@ const ActivityErrorDescriptions: Record<ActivityCodeError, string> = {
     'activity_api_errors.max_registrable_time_per_activity_limit_description',
   INVALID_ACTIVITY_APPROVAL_STATE:
     'activity_api_errors.invalid_activity_approval_state_description',
-  BLOCKED_PROJECT: 'activity_api_errors.blocked_project_description',
-  ILLEGAL_ARGUMENT: 'activity_api_errors.invalid_file_format_description'
+  BLOCKED_PROJECT: 'activity_api_errors.blocked_project_description'
 }
 
 @injectable()

src/features/binnacle/features/activity/domain/update-activity.ts

@@ -3,8 +3,7 @@ import { ActivityWithProjectRoleId } from './activity-with-project-role-id'
 
 export type UpdateActivity = Pick<
   ActivityWithProjectRoleId,
-  'id' | 'description' | 'billable' | 'projectRoleId' | 'hasEvidences'
+  'id' | 'description' | 'billable' | 'projectRoleId' | 'evidences'
 > & {
   interval: DateInterval
-  evidence?: File
 }

src/features/binnacle/features/activity/infrastructure/fake-activity-repository.ts

@@ -25,10 +25,6 @@ export class FakeActivityRepository implements ActivityRepository {
     return this.activities
   }
 
-  async getActivityEvidence(): Promise<File> {
-    return new File([''], 'filename')
-  }
-
   async getActivitySummary(): Promise<ActivityDaySummary[]> {
     return ActivityMother.marchActivitySummary()
   }