diff --git a/backend/src/modules/actions-archive/repositories/actions-archive.repository.ts b/backend/src/modules/actions-archive/repositories/actions-archive.repository.ts index 73dacb947..2b79ab1f4 100644 --- a/backend/src/modules/actions-archive/repositories/actions-archive.repository.ts +++ b/backend/src/modules/actions-archive/repositories/actions-archive.repository.ts @@ -155,9 +155,13 @@ export class ActionsArchiveRepository 'archive.eventName in (:...eventNames) AND archive.createdOn >= :startDate AND archive.createdOn <= :endDate', { eventNames: [ - TrackedEventName.CREATE_CONTRACT, - TrackedEventName.APPROVE_CONTRACT, - TrackedEventName.REJECT_CONTRACT, + TrackedEventName.CREATE_DOCUMENT_CONTRACT, + TrackedEventName.VALIDATE_DOCUMENT_CONTRACT, + TrackedEventName.SIGN_DOCUMENT_CONTRACT_BY_NGO, + TrackedEventName.SIGN_DOCUMENT_CONTRACT_BY_VOLUNTEER, + TrackedEventName.REJECT_DOCUMENT_CONTRACT_BY_NGO, + TrackedEventName.REJECT_DOCUMENT_CONTRACT_BY_VOLUNTEER, + TrackedEventName.DELETE_DOCUMENT_CONTRACT, ], startDate: startOfMonth(new Date()), endDate: endOfMonth(new Date()), diff --git a/backend/src/usecases/actions-archive/get-many-news.usecase.ts b/backend/src/usecases/actions-archive/get-many-news.usecase.ts index d29d76739..06ddc08da 100644 --- a/backend/src/usecases/actions-archive/get-many-news.usecase.ts +++ b/backend/src/usecases/actions-archive/get-many-news.usecase.ts @@ -31,9 +31,13 @@ export class GetManyNewsUsecase break; case NewsType.CONTRACTS: events = [ - TrackedEventName.CREATE_CONTRACT, - TrackedEventName.APPROVE_CONTRACT, - TrackedEventName.REJECT_CONTRACT, + TrackedEventName.CREATE_DOCUMENT_CONTRACT, + TrackedEventName.VALIDATE_DOCUMENT_CONTRACT, + TrackedEventName.SIGN_DOCUMENT_CONTRACT_BY_NGO, + TrackedEventName.SIGN_DOCUMENT_CONTRACT_BY_VOLUNTEER, + TrackedEventName.REJECT_DOCUMENT_CONTRACT_BY_NGO, + TrackedEventName.REJECT_DOCUMENT_CONTRACT_BY_VOLUNTEER, + TrackedEventName.DELETE_DOCUMENT_CONTRACT, ]; break; case NewsType.LOGGED_HOURS: diff --git a/mobile/src/common/enums/tracked-event-name.enum.ts b/mobile/src/common/enums/tracked-event-name.enum.ts index ead6fad54..63da2a447 100644 --- a/mobile/src/common/enums/tracked-event-name.enum.ts +++ b/mobile/src/common/enums/tracked-event-name.enum.ts @@ -10,4 +10,12 @@ export enum TrackedEventName { CREATE_CONTRACT = 'CREATE_CONTRACT', APPROVE_CONTRACT = 'APPROVE_CONTRACT', REJECT_CONTRACT = 'REJECT_CONTRACT', + + CREATE_DOCUMENT_CONTRACT = 'CREATE_DOCUMENT_CONTRACT', + VALIDATE_DOCUMENT_CONTRACT = 'VALIDATE_DOCUMENT_CONTRACT', + SIGN_DOCUMENT_CONTRACT_BY_NGO = 'SIGN_DOCUMENT_CONTRACT_BY_NGO', + SIGN_DOCUMENT_CONTRACT_BY_VOLUNTEER = 'SIGN_DOCUMENT_CONTRACT_BY_VOLUNTEER', + REJECT_DOCUMENT_CONTRACT_BY_NGO = 'REJECT_DOCUMENT_CONTRACT_BY_NGO', + REJECT_DOCUMENT_CONTRACT_BY_VOLUNTEER = 'REJECT_DOCUMENT_CONTRACT_BY_VOLUNTEER', + DELETE_DOCUMENT_CONTRACT = 'DELETE_DOCUMENT_CONTRACT', }