diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 57dc07330..fdf601f64 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -98,12 +98,11 @@ import { ImageCropperModule } from 'ngx-image-cropper'; import { metricsInterceptor, MetricsInterceptor } from './interceptors/metter.interceptor'; import { environment } from 'src/environments/environment'; import { StoreModule } from '@ngrx/store'; -import { calendarReducer } from './services/Repositorys/Agenda/agenda-memory-source.service'; - import {MatMenuModule} from '@angular/material/menu'; import {MatIconModule} from '@angular/material/icon'; import { AngularCropperjsModule } from 'angular-cropperjs'; +import { calendarReducer } from './module/agenda/data/data-source/agenda-memory-source.service'; // import { ServiceWorkerModule } from '@angular/service-worker'; // import { AngularFireModule } from '@angular/fire'; // import { AngularFireMessagingModule } from '@angular/fire/messaging'; diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index d6036a2e8..cb0b4bd92 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -23,13 +23,13 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { environment } from 'src/environments/environment'; import { TaskService } from 'src/app/services/task.service' import { ContactsService } from 'src/app/services/contacts.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { Observable } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { isHttpError } from 'src/app/services/http.service'; import { RoleIdService } from 'src/app/services/role-id.service'; -import { Utils } from 'src/app/services/Repositorys/Agenda/utils'; +import { Utils } from 'src/app/module/agenda/utils'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index e029bd954..591477aa5 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment'; import { ProcessesService } from 'src/app/services/processes.service'; import { NotificationHolderService } from 'src/app/store/notification-holder.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { ToastService } from 'src/app/services/toast.service'; import { NotificationRepositoryService } from 'src/app/module/notification/data/notification-repository.service'; import { Observable } from 'rxjs'; diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index 2ed44a338..85be07220 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -16,7 +16,7 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { PermissionService } from 'src/app/services/permission.service'; diff --git a/src/app/models/entiry/agenda/eventToApproveDetails.ts b/src/app/models/entiry/agenda/eventToApproveDetails.ts index 1bfc5d6cc..3447219b3 100644 --- a/src/app/models/entiry/agenda/eventToApproveDetails.ts +++ b/src/app/models/entiry/agenda/eventToApproveDetails.ts @@ -81,7 +81,7 @@ -import { EEventType } from "src/app/services/Repositorys/Agenda/model/enums"; +import { EEventType } from "src/app/module/agenda/data/dto/enums"; import { z } from "zod"; const ParticipantSchema = z.object({ diff --git a/src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector.ts b/src/app/module/agenda/async/change/attendeesLIstChangeDetector.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector.ts rename to src/app/module/agenda/async/change/attendeesLIstChangeDetector.ts diff --git a/src/app/module/agenda/async/change/shareCalendarChangeDetector.ts b/src/app/module/agenda/async/change/shareCalendarChangeDetector.ts new file mode 100644 index 000000000..d011d8485 --- /dev/null +++ b/src/app/module/agenda/async/change/shareCalendarChangeDetector.ts @@ -0,0 +1,37 @@ +import { z } from "zod"; +import { SharedCalendarListItemOutputDTO } from "../../data/dto/sharedCalendarOutputDTO"; + +type Changes = { + insert: SharedCalendarListItemOutputDTO[]; + update: SharedCalendarListItemOutputDTO[]; + remove: SharedCalendarListItemOutputDTO[]; +}; + +export function SharedCalendarListDetectChanges( + localList: SharedCalendarListItemOutputDTO[], + serverList: SharedCalendarListItemOutputDTO[] +): Changes { + const changes: Changes = { insert: [], update: [], remove: [] }; + + const localMap = new Map(localList.map(item => [item.wxUserId, item])); + const serverMap = new Map(serverList.map(item => [item.wxUserId, item])); + + // Detect new or updated items + for (const [id, serverItem] of serverMap) { + const localItem = localMap.get(id); + if (!localItem) { + changes.insert.push(serverItem); + } else if (localItem.wxFullName !== serverItem.wxFullName) { + changes.update.push(serverItem); + } + } + + // Detect deleted items + for (const [id, localItem] of localMap) { + if (!serverMap.has(id)) { + changes.remove.push(localItem); + } + } + + return changes; +} diff --git a/src/app/module/agenda/data/async/change/attendeesLIstChangeDetector.ts b/src/app/module/agenda/data/async/change/attendeesLIstChangeDetector.ts new file mode 100644 index 000000000..7e3eba5fc --- /dev/null +++ b/src/app/module/agenda/data/async/change/attendeesLIstChangeDetector.ts @@ -0,0 +1,41 @@ +interface attendees { + + EmailAddress : string + Name: string + UserType: string + attendeeType: string + wxUserId: string + Id: string +} + +type Changes = { + insert: attendees[]; + remove: attendees[]; +}; + +export function AttendeesLIstChangeDetector( + localList: attendees[], + serverList: attendees[] +): Changes { + const changes: Changes = { insert: [], remove: [] }; + + const localMap = new Map(localList.map(item => [item.wxUserId, item])); + const serverMap = new Map(serverList.map(item => [item.wxUserId, item])); + + // Detect new or updated items + for (const [id, serverItem] of serverMap) { + const localItem = localMap.get(id); + if (!localItem) { + changes.insert.push(serverItem); + } + } + + // Detect deleted items + for (const [id, localItem] of localMap) { + if (!serverMap.has(id)) { + changes.remove.push(localItem); + } + } + + return changes; +} diff --git a/src/app/services/Repositorys/Agenda/async/change/shareCalendarChangeDetector.ts b/src/app/module/agenda/data/async/change/shareCalendarChangeDetector.ts similarity index 92% rename from src/app/services/Repositorys/Agenda/async/change/shareCalendarChangeDetector.ts rename to src/app/module/agenda/data/async/change/shareCalendarChangeDetector.ts index 2f0eee567..b2acf2f37 100644 --- a/src/app/services/Repositorys/Agenda/async/change/shareCalendarChangeDetector.ts +++ b/src/app/module/agenda/data/async/change/shareCalendarChangeDetector.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import { SharedCalendarListItemOutputDTO } from "../../model/sharedCalendarOutputDTO"; +import { SharedCalendarListItemOutputDTO } from "../../dto/sharedCalendarOutputDTO"; type Changes = { insert: SharedCalendarListItemOutputDTO[]; diff --git a/src/app/services/Repositorys/Agenda/agenda-data.service.ts b/src/app/module/agenda/data/data-source/agenda-data.service.ts similarity index 89% rename from src/app/services/Repositorys/Agenda/agenda-data.service.ts rename to src/app/module/agenda/data/data-source/agenda-data.service.ts index abeffe454..70a2d4de1 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data.service.ts +++ b/src/app/module/agenda/data/data-source/agenda-data.service.ts @@ -1,14 +1,14 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { EventInputDTO } from './model/eventInputDTO'; +import { EventInputDTO } from '../dto/eventInputDTO'; import { SessionStore } from 'src/app/store/session.service'; -import { SharedCalendarListOutputDTO } from './model/sharedCalendarOutputDTO'; -import { HttpService } from '../../http.service'; -import { TracingType } from '../../monitoring/opentelemetry/tracer'; -import { EventOutputDTO } from './model/eventDTOOutput'; -import { AttendeesRemoveInputDTO } from './model/attendeeRemoveInputDTO'; -import { EventListOutputDTO } from './model/eventListDTOOutput'; +import { SharedCalendarListOutputDTO } from '../dto/sharedCalendarOutputDTO'; +import { EventOutputDTO } from '../dto/eventDTOOutput'; +import { AttendeesRemoveInputDTO } from '../dto/attendeeRemoveInputDTO'; +import { EventListOutputDTO } from '../dto/eventListDTOOutput'; +import { HttpService } from 'src/app/services/http.service'; +import { TracingType } from 'src/app/services/monitoring/opentelemetry/tracer'; @Injectable({ providedIn: 'root' diff --git a/src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts b/src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts similarity index 96% rename from src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts rename to src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts index c7fafa6f3..84fee87bd 100644 --- a/src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts +++ b/src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { Dexie, EntityTable, liveQuery } from 'Dexie'; -import { SharedCalendarListItemOutputDTO, SharedCalendarListOutputDTO } from './model/sharedCalendarOutputDTO'; import { any, z } from 'zod'; import { err, ok } from 'neverthrow'; import { from } from 'rxjs'; +import { SharedCalendarListItemOutputDTO } from '../dto/sharedCalendarOutputDTO'; const tableScharedCalendar = z.object({ diff --git a/src/app/services/Repositorys/Agenda/agenda-memory-source.service.ts b/src/app/module/agenda/data/data-source/agenda-memory-source.service.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/agenda-memory-source.service.ts rename to src/app/module/agenda/data/data-source/agenda-memory-source.service.ts diff --git a/src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts b/src/app/module/agenda/data/dto/addAttachmentDTOInput.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts rename to src/app/module/agenda/data/dto/addAttachmentDTOInput.ts diff --git a/src/app/services/Repositorys/Agenda/model/attendeeInputDTO.ts b/src/app/module/agenda/data/dto/attendeeInputDTO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/attendeeInputDTO.ts rename to src/app/module/agenda/data/dto/attendeeInputDTO.ts diff --git a/src/app/services/Repositorys/Agenda/model/attendeeRemoveInputDTO.ts b/src/app/module/agenda/data/dto/attendeeRemoveInputDTO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/attendeeRemoveInputDTO.ts rename to src/app/module/agenda/data/dto/attendeeRemoveInputDTO.ts diff --git a/src/app/services/Repositorys/Agenda/model/enums.ts b/src/app/module/agenda/data/dto/enums.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/enums.ts rename to src/app/module/agenda/data/dto/enums.ts diff --git a/src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts b/src/app/module/agenda/data/dto/eventDTOOutput.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts rename to src/app/module/agenda/data/dto/eventDTOOutput.ts diff --git a/src/app/services/Repositorys/Agenda/model/eventInputDTO.ts b/src/app/module/agenda/data/dto/eventInputDTO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/eventInputDTO.ts rename to src/app/module/agenda/data/dto/eventInputDTO.ts diff --git a/src/app/services/Repositorys/Agenda/model/eventListDTOOutput.ts b/src/app/module/agenda/data/dto/eventListDTOOutput.ts similarity index 98% rename from src/app/services/Repositorys/Agenda/model/eventListDTOOutput.ts rename to src/app/module/agenda/data/dto/eventListDTOOutput.ts index db6ebce66..f851e5792 100644 --- a/src/app/services/Repositorys/Agenda/model/eventListDTOOutput.ts +++ b/src/app/module/agenda/data/dto/eventListDTOOutput.ts @@ -1,6 +1,5 @@ import { z } from 'zod'; -import { EEventCategory, EEventOwnerType, EEventStatus, EEventType } from '../model/enums'; - +import { EEventCategory, EEventOwnerType, EEventStatus, EEventType } from './enums'; const OwnerSchema = z.object({ wxUserId: z.number(), diff --git a/src/app/services/Repositorys/Agenda/model/eventSearchOutputDTO.ts b/src/app/module/agenda/data/dto/eventSearchOutputDTO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/eventSearchOutputDTO.ts rename to src/app/module/agenda/data/dto/eventSearchOutputDTO.ts diff --git a/src/app/services/Repositorys/Agenda/model/eventToApproveListOutputDTO.ts b/src/app/module/agenda/data/dto/eventToApproveListOutputDTO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/eventToApproveListOutputDTO.ts rename to src/app/module/agenda/data/dto/eventToApproveListOutputDTO.ts diff --git a/src/app/services/Repositorys/Agenda/model/eventUpdateInputDtO.ts b/src/app/module/agenda/data/dto/eventUpdateInputDtO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/eventUpdateInputDtO.ts rename to src/app/module/agenda/data/dto/eventUpdateInputDtO.ts diff --git a/src/app/services/Repositorys/Agenda/model/sharedCalendarOutputDTO.ts b/src/app/module/agenda/data/dto/sharedCalendarOutputDTO.ts similarity index 100% rename from src/app/services/Repositorys/Agenda/model/sharedCalendarOutputDTO.ts rename to src/app/module/agenda/data/dto/sharedCalendarOutputDTO.ts diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/module/agenda/data/repository/agenda-data-repository.service.ts similarity index 87% rename from src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts rename to src/app/module/agenda/data/repository/agenda-data-repository.service.ts index 4da95cc8f..6d16b7243 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts +++ b/src/app/module/agenda/data/repository/agenda-data-repository.service.ts @@ -1,35 +1,35 @@ import { Injectable } from '@angular/core'; -import { AgendaDataService } from './agenda-data.service'; +import { AgendaDataService } from '../data-source/agenda-data.service'; import { map } from 'rxjs/operators'; -import { ListEventMapper } from './mapper/EventListMapper'; -import { EventMapper } from './mapper/EventDetailsMapper'; -import { Utils } from './utils'; +import { ListEventMapper } from '../../domain/mapper/EventListMapper'; +import { EventMapper } from '../../domain/mapper/EventDetailsMapper'; import { Event } from 'src/app/models/event.model'; import { SessionStore } from 'src/app/store/session.service'; -import { EventListToApproveMapper } from './mapper/eventToApproveListMapper'; +import { EventListToApproveMapper } from '../../domain/mapper/eventToApproveListMapper'; import { err, ok } from 'neverthrow'; import { HttpErrorResponse } from '@angular/common/http'; -import { EventToApproveDetailsMapper } from './mapper/EventToApproveDetailsMapper'; -import { AgendaLocalDataSourceService, TableSharedCalendar } from './agenda-local-data-source.service'; -import { EEventFilterStatus } from './model/enums'; -import { isHttpError } from '../../http.service'; -import { TracingType } from '../../monitoring/opentelemetry/tracer'; -import { APINODReturn } from '../../decorator/api-validate-schema.decorator'; -import { EventToApproveDataOutputDTOSchema } from './model/eventToApproveListOutputDTO'; -import { EventOutputDTOSchema } from './model/eventDTOOutput'; -import { SharedCalendarListDetectChanges } from './async/change/shareCalendarChangeDetector'; -import { SharedCalendarListItemOutputDTO } from './model/sharedCalendarOutputDTO'; -import { EventUpdateInputDTOSchema } from './model/eventUpdateInputDtO'; -import { AttachInputDTOSchema } from './model/addAttachmentDTOInput'; -import { EventListDataOutputDTOSchema } from './model/eventListDTOOutput'; -import { EventSearchMapper } from './mapper/EventSearchMapper'; +import { EventToApproveDetailsMapper } from '../../domain/mapper/EventToApproveDetailsMapper'; +import { AgendaLocalDataSourceService, TableSharedCalendar } from '../data-source/agenda-local-data-source.service'; +import { EEventFilterStatus } from '../dto/enums'; +import { EventToApproveDataOutputDTOSchema } from '../dto/eventToApproveListOutputDTO'; +import { EventOutputDTOSchema } from '../dto/eventDTOOutput'; +import { SharedCalendarListDetectChanges } from '../async/change/shareCalendarChangeDetector'; +import { SharedCalendarListItemOutputDTO } from '../dto/sharedCalendarOutputDTO'; +import { EventUpdateInputDTOSchema } from '../dto/eventUpdateInputDtO'; +import { AttachInputDTOSchema } from '../dto/addAttachmentDTOInput'; +import { EventListDataOutputDTOSchema } from '../dto/eventListDTOOutput'; +import { EventSearchMapper } from '../../domain/mapper/EventSearchMapper'; import { select, Store } from '@ngrx/store'; -import { CalendarState, pushEvent, removeRangeForCalendar, selectEventsInRange } from './agenda-memory-source.service'; +import { CalendarState, pushEvent, removeRangeForCalendar, selectEventsInRange } from '../data-source/agenda-memory-source.service'; import { NativeNotificationService } from 'src/app/services/native-notification.service'; import { ListBoxService } from 'src/app/services/agenda/list-box.service'; import { EventListStore } from 'src/app/models/agenda/AgendaEventList'; -import { AttendeeInputDTOSchema } from './model/attendeeInputDTO'; -import { EventInputDTOSchema } from './model/eventInputDTO'; +import { AttendeeInputDTOSchema } from '../dto/attendeeInputDTO'; +import { EventInputDTOSchema } from '../dto/eventInputDTO'; +import { Utils } from 'src/app/module/agenda/utils'; +import { APINODReturn } from 'src/app/services/decorator/api-validate-schema.decorator'; +import { TracingType } from 'src/app/services/monitoring/opentelemetry/tracer'; +import { isHttpError } from 'src/app/services/http.service'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/services/Repositorys/Agenda/mapper/EventDetailsMapper.ts b/src/app/module/agenda/domain/mapper/EventDetailsMapper.ts similarity index 95% rename from src/app/services/Repositorys/Agenda/mapper/EventDetailsMapper.ts rename to src/app/module/agenda/domain/mapper/EventDetailsMapper.ts index e7d5cfa89..257b0ff95 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventDetailsMapper.ts +++ b/src/app/module/agenda/domain/mapper/EventDetailsMapper.ts @@ -1,5 +1,5 @@ -import { EAttendeeType, EEventCategory, EEventOwnerType, EEventStatus } from "../model/enums"; -import { EventOutputDTO } from "../model/eventDTOOutput" +import { EEventCategory, EEventOwnerType, EEventStatus, EAttendeeType } from "../../data/dto/enums"; +import { EventOutputDTO } from "../../data/dto/eventDTOOutput"; function getTextInsideParentheses(inputString) { var startIndex = inputString.indexOf('('); diff --git a/src/app/services/Repositorys/Agenda/mapper/EventListMapper.ts b/src/app/module/agenda/domain/mapper/EventListMapper.ts similarity index 93% rename from src/app/services/Repositorys/Agenda/mapper/EventListMapper.ts rename to src/app/module/agenda/domain/mapper/EventListMapper.ts index f067261e3..40ee5a4ab 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventListMapper.ts +++ b/src/app/module/agenda/domain/mapper/EventListMapper.ts @@ -1,7 +1,7 @@ import { EventList } from "src/app/models/entiry/agenda/eventList" -import { EEventCategory, EEventOwnerType, EEventStatus, EEventType } from "../model/enums"; import { XTracer } from "src/app/services/monitoring/opentelemetry/tracer"; -import { EventListOutputDTO } from "../model/eventListDTOOutput"; +import { EEventCategory, EEventOwnerType, EEventType, EEventStatus } from "../../data/dto/enums"; +import { EventListOutputDTO } from "../../data/dto/eventListDTOOutput"; function getTextInsideParentheses(inputString): string { var startIndex = inputString.indexOf('('); diff --git a/src/app/services/Repositorys/Agenda/mapper/EventSearchMapper.ts b/src/app/module/agenda/domain/mapper/EventSearchMapper.ts similarity index 93% rename from src/app/services/Repositorys/Agenda/mapper/EventSearchMapper.ts rename to src/app/module/agenda/domain/mapper/EventSearchMapper.ts index 0727df4a8..e4024b92f 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventSearchMapper.ts +++ b/src/app/module/agenda/domain/mapper/EventSearchMapper.ts @@ -1,5 +1,5 @@ import { SearchList } from "src/app/models/search-document"; -import { EventListOutputDTO } from "../model/eventListDTOOutput"; +import { EventListOutputDTO } from "../../data/dto/eventListDTOOutput"; function getTextInsideParentheses(inputString): string { var startIndex = inputString.indexOf('('); diff --git a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts b/src/app/module/agenda/domain/mapper/EventToApproveDetailsMapper.ts similarity index 97% rename from src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts rename to src/app/module/agenda/domain/mapper/EventToApproveDetailsMapper.ts index a7c4f47b1..c7ddb9a8e 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts +++ b/src/app/module/agenda/domain/mapper/EventToApproveDetailsMapper.ts @@ -1,6 +1,6 @@ import { EventToApproveDetails } from "src/app/models/entiry/agenda/eventToApproveDetails" -import { EventOutputDTO } from "../model/eventDTOOutput" -import { EAttendeeType, EEventCategory, EEventOwnerType, EEventStatus } from "../model/enums"; +import { EEventCategory, EEventOwnerType, EEventStatus, EAttendeeType } from "../../data/dto/enums"; +import { EventOutputDTO } from "../../data/dto/eventDTOOutput"; function getTextInsideParentheses(inputString) { var startIndex = inputString.indexOf('('); diff --git a/src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts b/src/app/module/agenda/domain/mapper/eventToApproveListMapper.ts similarity index 96% rename from src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts rename to src/app/module/agenda/domain/mapper/eventToApproveListMapper.ts index 221d08473..b8317a230 100644 --- a/src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts +++ b/src/app/module/agenda/domain/mapper/eventToApproveListMapper.ts @@ -1,6 +1,7 @@ -import { EventToApproveListOutputDTO } from "../model/eventToApproveListOutputDTO"; + import { EventToApproveList } from "src/app/models/entiry/agenda/eventToApproveList"; -import { EEventCategory, EEventOwnerType, EEventStatus } from "../model/enums"; +import { EEventCategory, EEventOwnerType, EEventStatus } from "../../data/dto/enums"; +import { EventToApproveListOutputDTO } from "../../data/dto/eventToApproveListOutputDTO"; function getTextInsideParentheses(inputString): string { diff --git a/src/app/services/Repositorys/Agenda/utils.ts b/src/app/module/agenda/utils.ts similarity index 97% rename from src/app/services/Repositorys/Agenda/utils.ts rename to src/app/module/agenda/utils.ts index 736bcb2e8..3c6256d9d 100644 --- a/src/app/services/Repositorys/Agenda/utils.ts +++ b/src/app/module/agenda/utils.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { EventsService } from '../../events.service'; +import { EventsService } from 'src/app/services/events.service'; import { RoleIdService } from 'src/app/services/role-id.service' -import { TableSharedCalendar } from './agenda-local-data-source.service'; +import { TableSharedCalendar } from './data/data-source/agenda-local-data-source.service'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 726b1b426..2aa2261db 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -30,21 +30,21 @@ import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; import { PermissionService } from 'src/app/services/permission.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { environment } from 'src/environments/environment'; import { RoleIdService } from 'src/app/services/role-id.service' import { EventListStore } from 'src/app/models/agenda/AgendaEventList'; import { Cy } from 'cypress/enum' import { Observable, Subject, Subscription } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { map, throttleTime } from 'rxjs/operators'; -import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { ToastService } from 'src/app/services/toast.service'; -import { CalendarState, selectEventSource } from 'src/app/services/Repositorys/Agenda/agenda-memory-source.service'; import { Store } from '@ngrx/store'; import { NotificationRepositoryService } from 'src/app/module/notification/data/notification-repository.service'; +import { EEventFilterStatus } from 'src/app/module/agenda/data/dto/enums'; +import { CalendarState, selectEventSource } from 'src/app/module/agenda/data/data-source/agenda-memory-source.service'; // import { Unsubscribable } from '../../../../android/app/build/intermediates/assets/debug/public/assets/dexie/dist/dexie'; @Component({ diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 9ea627bf5..5665533a6 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -16,14 +16,14 @@ import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service' import { environment } from 'src/environments/environment'; import { ContactsService } from 'src/app/services/contacts.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; -import { Utils } from 'src/app/services/Repositorys/Agenda/utils'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { Observable } from 'rxjs'; import { RoleIdService } from 'src/app/services/role-id.service' import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; -import { AttendeesLIstChangeDetector } from 'src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector'; import { EventRecurrencePage, EventRecurrenceComponentReturn } from 'src/app/modals/event-recurrence/event-recurrence.page'; +import { Utils } from 'src/app/module/agenda/utils'; +import { AttendeesLIstChangeDetector } from 'src/app/module/agenda/data/async/change/attendeesLIstChangeDetector'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -458,18 +458,20 @@ export class EditEventPage implements OnInit { const calendar = await this.agendaDataRepository.getCalendarByUserId(this.selectedUserCalendar) if(calendar.isOk()) { - const value = await this.agendaDataRepository.updateEvent(this.postEvent.EventId, this.postEvent, this.editAllEvent, calendar.value, tracing)//.subscribe((value) => { + const _value = this.agendaDataRepository.updateEvent(this.postEvent.EventId, this.postEvent, this.editAllEvent, calendar.value, tracing)//.subscribe((value) => { - if(value.isOk()) { - console.log(value.value) - this.close(); - this.httpErrorHandle.httpsSucessMessagge('Editar evento') - tracing.setAttribute('outcome', 'success') - } else { + _value.then((value) => { + if(value.isOk()) { + console.log(value.value) + this.close(); + this.httpErrorHandle.httpsSucessMessagge('Editar evento') + tracing.setAttribute('outcome', 'success') + } else { - tracing.setAttribute('outcome', 'failed') - console.log('edit event error: ', value.error) - } + tracing.setAttribute('outcome', 'failed') + console.log('edit event error: ', value.error) + } + }) console.log({serverCurrentList: this.serverCurrentList, Attendees: this.postEvent.Attendees}) diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index fd87574e3..6fd1b6e8a 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -8,7 +8,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; @Component({ diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index de25940f4..8726bcb44 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -21,9 +21,9 @@ import { TaskService } from 'src/app/services/task.service' import { ContactsService } from 'src/app/services/contacts.service'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, ThemePalette } from '@angular/material/core'; import { MomentDateAdapter } from '@angular/material-moment-adapter'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { Observable } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { map } from 'rxjs/operators'; import { RoleIdService } from 'src/app/services/role-id.service' import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index bd2379c78..8409dbf7b 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -15,7 +15,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { PermissionService } from 'src/app/services/permission.service'; diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 0e7bbc9d5..c3511552f 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -15,8 +15,8 @@ import { ViewEventPage } from 'src/app/modals/view-event/view-event.page'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { SessionStore } from 'src/app/store/session.service'; import { TaskService } from 'src/app/services/task.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; -import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; +import { EEventFilterStatus } from 'src/app/module/agenda/data/dto/enums'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; @Component({ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index aae9dfbc9..14ce4936e 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -16,7 +16,7 @@ import { RouteService } from 'src/app/services/route.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { EventsService } from 'src/app/services/events.service'; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 76102e0a2..ed2b355cd 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -14,12 +14,12 @@ import { RouteService } from 'src/app/services/route.service'; import { EventsService } from 'src/app/services/events.service'; import { SessionStore } from 'src/app/store/session.service'; import { environment } from 'src/environments/environment'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { map } from 'rxjs/operators'; import { Observable } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { RoleIdService } from 'src/app/services/role-id.service' -import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; +import { EEventFilterStatus } from 'src/app/module/agenda/data/dto/enums'; import { isHttpError } from 'src/app/services/http.service'; import { ToastService } from 'src/app/services/toast.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index cf380f961..d9639286f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -23,10 +23,10 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { environment } from 'src/environments/environment'; import { TaskService } from 'src/app/services/task.service' import { ContactsService } from 'src/app/services/contacts.service'; -import { Utils } from 'src/app/services/Repositorys/Agenda/utils'; +import { Utils } from 'src/app/module/agenda/utils'; import { Observable } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index b68eac528..9716ba458 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -23,7 +23,7 @@ import { CPSession } from 'src/app/store/documentManagement'; import { StorageService } from 'src/app/services/storage.service'; import { DeviceService } from 'src/app/services/device.service' import { Cy } from 'cypress/enum' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { NotificationRepositoryService } from 'src/app/module/notification/data/notification-repository.service' @Component({ selector: 'app-login', diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 4757b5b5f..e90e83667 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -18,12 +18,12 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { momentG } from 'src/plugin/momentG'; import { Cy } from 'cypress/enum' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { SessionStore } from 'src/app/store/session.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { ToastService } from 'src/app/services/toast.service'; -import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; +import { EEventFilterStatus } from 'src/app/module/agenda/data/dto/enums'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { diff --git a/src/app/services/Repositorys/Agenda/agendaDataModels.ts b/src/app/services/Repositorys/Agenda/agendaDataModels.ts deleted file mode 100644 index e10d87945..000000000 --- a/src/app/services/Repositorys/Agenda/agendaDataModels.ts +++ /dev/null @@ -1,151 +0,0 @@ -// import { z } from 'zod'; - -// export const AttachCommunicationInputDTOSchema = z.object({ -// attachmentId: z.string().uuid(), -// description: z.string().nullable().optional(), -// typeSharing: z.number().int(), -// dateViewExpire: z.string().datetime().nullable().optional(), -// }).strict(); - - -// export const AttachmentInputDTOSchema = z.object({ -// sourceId: z.string().nullable().optional(), -// sourceName: z.string().nullable().optional(), -// description: z.string().nullable().optional(), -// applicationId: z.number().int(), -// }).strict(); - - -// export const AttendeeCommunicationInputDTOSchema = z.object({ -// attendeeId: z.string().uuid(), -// message: z.string().nullable().optional(), -// }).strict(); - -// export const AttendeeExternalInputDTOSchema = z.object({ -// name: z.string().min(1), -// emailAddress: z.string().email().nullable().optional(), -// message: z.string().nullable().optional(), -// }).strict(); - -// export const AttendeeInputDTOSchema = z.object({ -// name: z.string().min(1), -// emailAddress: z.string().nullable().optional(), -// attendeeType: z.number(), -// wxUserId: z.number().int(), -// }).strict(); - -// const EAttendeeTypeDTO = z.number(); - -// const EEventCategoryDTO = z.number(); - -// const EEventFilterCategoryDTO = z.number(); - -// const EEventFilterStatusDTO = z.number(); - -// const EEventFilterTypeDTO = z.number(); - -// const EEventOwnerTypeDTO = z.number(); - -// const EEventStatusDTO = z.number(); - -// const EEventTypeDTO = z.number(); - -// const ERecurringTypeDTO = z.number(); - -// const EventAddAttachmentDTOSchema = z.object({ -// attachments: z.array(AttachmentInputDTOSchema), -// }).strict(); - -// const EventAddAttendeeDTOSchema = z.object({ -// attendees: z.array(AttendeeInputDTOSchema), -// }).strict(); - -// export const EventCommunicationInputDTOSchema = z.object({ -// attachs: z.array(AttachCommunicationInputDTOSchema).nullable().optional(), -// attendees: z.array(AttendeeCommunicationInputDTOSchema).nullable().optional(), -// externalAttendees: z.array(AttendeeExternalInputDTOSchema).nullable().optional(), -// }).strict(); - -// // export const EventInputDTOSchema = z.object({ -// // userId: z.number().int(), -// // ownerType: EEventOwnerTypeDTO, -// // subject: z.string().min(1), -// // body: z.string().min(1), -// // location: z.string().nullable().optional(), -// // startDate: z.string(), -// // endDate: z.string(), -// // type: EEventTypeDTO, -// // category: EEventCategoryDTO, -// // attendees: z.array(AttendeeInputDTOSchema).nullable().optional(), -// // attachments: z.array(AttachmentInputDTOSchema).nullable().optional(), -// // recurrence: z.object({ -// // frequency: z.number().int(), -// // until: z.string(), -// // }), -// // organizerId: z.number().int(), -// // isAllDayEvent: z.boolean(), -// // }).strict(); - -// export const EventRecurrenceInputDTOSchema = z.object({ -// frequency: z.number().int(), -// occurrences: z.number().int(), -// }).strict(); - -// export const EventRemoveAttachmentDTOSchema = z.object({ -// attachments: z.array(z.string().uuid()), -// }).strict(); - -// export const EventRemoveAttendeeDTOSchema = z.object({ -// attendees: z.array(z.string().uuid()), -// }).strict(); - -// export const EventUpdateDTOSchema = z.object({ -// subject: z.string().min(1), -// body: z.string().min(1), -// location: z.string().min(1), -// startDate: z.string().datetime(), -// endDate: z.string().datetime(), -// isAllDayEvent: z.boolean(), -// updateAllEvents: z.boolean(), -// recurrence: z.object({ -// frequency: z.number().int(), -// occurrences: z.number().int(), -// }), -// }).strict(); - -// export const EventUpdateStatusDTOSchema = z.object({ -// status: EEventStatusDTO, -// comment: z.string().nullable().optional(), -// }).strict(); - -// export const ProblemDetailsDTOSchema = z.object({ -// type: z.string().nullable().optional(), -// title: z.string().nullable().optional(), -// status: z.number().int().nullable().optional(), -// detail: z.string().nullable().optional(), -// instance: z.string().nullable().optional(), -// }).strict(); - -// export const ResponseSimpleDTOSchema = z.object({ -// success: z.boolean(), -// message: z.string().nullable().optional(), -// data: z.any().nullable().optional(), -// }) - - -// export type AttachCommunicationInputDTO = z.infer; -// export type AttachmentInputDTO = z.infer; -// export type AttendeeCommunicationInputDTO = z.infer; -// export type AttendeeExternalInputDTO = z.infer; -// export type AttendeeInputDTO = z.infer; -// export type EventAddAttachmentDTO = z.infer; -// export type EventAddAttendeeDTO = z.infer; -// export type EventCommunicationInputDTO = z.infer; -// // export type EventInputDTO = z.infer; -// export type EventRecurrenceInputDTO = z.infer; -// export type EventRemoveAttachmentDTO = z.infer; -// export type EventRemoveAttendeeDTO = z.infer; -// export type EventUpdateDTO = z.infer; -// export type EventUpdateStatusDTO = z.infer; -// export type ProblemDetailsDTO = z.infer; -// export type ResponseSimpleDTO = z.infer; diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 93f7341fa..9dd10185d 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -19,10 +19,10 @@ import { Router } from '@angular/router'; import { v4 as uuidv4 } from 'uuid' import { ChangeProfileService } from './change-profile.service'; import { PermissionService } from './permission.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { SortService } from './functions/sort.service'; import { TracingType, XTracerAsync } from './monitoring/opentelemetry/tracer'; -import { EEventFilterStatus } from './Repositorys/Agenda/model/enums'; +import { EEventFilterStatus } from '../module/agenda/data/dto/enums'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index a1d530bbc..513ef7120 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -11,7 +11,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag import { ThemeService } from 'src/app/services/theme.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { EventToApproveDetails } from 'src/app/models/entiry/agenda/eventToApproveDetails'; import { EventsService } from 'src/app/services/events.service'; import { isHttpError } from 'src/app/services/http.service'; diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 21f3b8181..78dd7ed89 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -15,9 +15,9 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { EventToApproveEdit } from 'src/app/models/event.model'; import { ThemeService } from 'src/app/services/theme.service' import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; -import { AttendeesLIstChangeDetector } from 'src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector'; +import { AttendeesLIstChangeDetector } from 'src/app/module/agenda/data/async/change/attendeesLIstChangeDetector'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 137cff780..563605a16 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -13,14 +13,14 @@ import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { ContactsService } from 'src/app/services/contacts.service' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { SearchList_v2 } from 'src/app/models/search-document'; -import { Utils } from 'src/app/services/Repositorys/Agenda/utils'; +import { Utils } from 'src/app/module/agenda/utils'; import { Observable } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { RoleIdService } from 'src/app/services/role-id.service' import { XTracerAsync, TracingType } from 'src/app/services/monitoring/opentelemetry/tracer'; -import { AttendeesLIstChangeDetector } from 'src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector'; +import { AttendeesLIstChangeDetector } from 'src/app/module/agenda/data/async/change/attendeesLIstChangeDetector'; import { EventRecurrenceComponentReturn, EventRecurrencePage } from 'src/app/modals/event-recurrence/event-recurrence.page'; @Component({ selector: 'app-edit-event', diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index ee5f17874..8131f0752 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -9,13 +9,13 @@ import { SessionStore } from 'src/app/store/session.service'; import { EventsService } from 'src/app/services/events.service'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; import { environment } from 'src/environments/environment'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { EventToApproveList } from 'src/app/models/entiry/agenda/eventToApproveList'; import { RoleIdService } from 'src/app/services/role-id.service' import { map } from 'rxjs/operators'; import { Observable } from 'rxjs'; -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; -import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; +import { EEventFilterStatus } from 'src/app/module/agenda/data/dto/enums'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { ToastService } from 'src/app/services/toast.service'; diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 7bcb3b777..bd23e7db9 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -26,9 +26,9 @@ import { EventToAprove } from 'src/app/models/eventToAprove.model'; import { Observable } from 'rxjs'; import { TaskService } from 'src/app/services/task.service' import { ChangeProfileService } from 'src/app/services/change-profile.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { RoleIdService } from 'src/app/services/role-id.service' -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service'; import { UserList } from 'src/app/models/entiry/agenda/contact'; diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index ac200f3db..329b439c2 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -18,7 +18,7 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service' import { NavigationExtras, Router } from '@angular/router'; import { EventController } from 'src/app/controller/event' import { DateService } from 'src/app/services/date.service'; -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { SearchList_v2 } from 'src/app/models/search-document'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 40f59645f..661904425 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -10,9 +10,9 @@ import { Event, EventToApproveEdit } from '../../../models/event.model'; import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { ThemeService } from 'src/app/services/theme.service' import { HttpErrorHandle } from 'src/app/services/http-error-handle.service' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; -import { AttendeesLIstChangeDetector } from 'src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector'; +import { AttendeesLIstChangeDetector } from 'src/app/module/agenda/data/async/change/attendeesLIstChangeDetector'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 832fe9e1f..91b97bef3 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -12,12 +12,12 @@ import { EventsService } from 'src/app/services/events.service'; import { environment } from 'src/environments/environment'; import { TaskService } from 'src/app/services/task.service' import { ThemeService } from 'src/app/services/theme.service' -import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; +import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { map } from 'rxjs/operators'; import { RoleIdService } from 'src/app/services/role-id.service' -import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; +import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service'; import { Observable } from 'rxjs'; -import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; +import { EEventFilterStatus } from 'src/app/module/agenda/data/dto/enums'; import { isHttpError } from 'src/app/services/http.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { ToastService } from 'src/app/services/toast.service'; diff --git a/version/git-version.ts b/version/git-version.ts index e791a94df..3c7f36338 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "edcaf951c", - "SHA": "edcaf951c2d85b037c7a00583fc3fc2634fdae89", + "shortSHA": "2d2f00cb4", + "SHA": "2d2f00cb4c3ac94d233d9a834eec8d69613006b0", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jul 30 15:52:07 2024 +0100'", - "lastCommitMessage": "improve monitoring the solution", - "lastCommitNumber": "5895", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/module/user/data/datasource/user-remote-repository.service.ts\n\tmodified: src/app/module/user/data/user-repository.service.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/services/http.service.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Wed Jul 31 09:35:35 2024 +0100'", + "lastCommitMessage": "add tracing tags", + "lastCommitNumber": "5896", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/models/entiry/agenda/eventToApproveDetails.ts\n\trenamed: src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector.ts -> src/app/module/agenda/async/change/attendeesLIstChangeDetector.ts\n\tnew file: src/app/module/agenda/async/change/shareCalendarChangeDetector.ts\n\tnew file: src/app/module/agenda/data/async/change/attendeesLIstChangeDetector.ts\n\trenamed: src/app/services/Repositorys/Agenda/async/change/shareCalendarChangeDetector.ts -> src/app/module/agenda/data/async/change/shareCalendarChangeDetector.ts\n\trenamed: src/app/services/Repositorys/Agenda/agenda-data.service.ts -> src/app/module/agenda/data/data-source/agenda-data.service.ts\n\trenamed: src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts -> src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts\n\trenamed: src/app/services/Repositorys/Agenda/agenda-memory-source.service.ts -> src/app/module/agenda/data/data-source/agenda-memory-source.service.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts -> src/app/module/agenda/data/dto/addAttachmentDTOInput.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/attendeeInputDTO.ts -> src/app/module/agenda/data/dto/attendeeInputDTO.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/attendeeRemoveInputDTO.ts -> src/app/module/agenda/data/dto/attendeeRemoveInputDTO.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/enums.ts -> src/app/module/agenda/data/dto/enums.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts -> src/app/module/agenda/data/dto/eventDTOOutput.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/eventInputDTO.ts -> src/app/module/agenda/data/dto/eventInputDTO.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/eventListDTOOutput.ts -> src/app/module/agenda/data/dto/eventListDTOOutput.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/eventSearchOutputDTO.ts -> src/app/module/agenda/data/dto/eventSearchOutputDTO.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/eventToApproveListOutputDTO.ts -> src/app/module/agenda/data/dto/eventToApproveListOutputDTO.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/eventUpdateInputDtO.ts -> src/app/module/agenda/data/dto/eventUpdateInputDtO.ts\n\trenamed: src/app/services/Repositorys/Agenda/model/sharedCalendarOutputDTO.ts -> src/app/module/agenda/data/dto/sharedCalendarOutputDTO.ts\n\trenamed: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts -> src/app/module/agenda/data/repository/agenda-data-repository.service.ts\n\trenamed: src/app/services/Repositorys/Agenda/mapper/EventDetailsMapper.ts -> src/app/module/agenda/domain/mapper/EventDetailsMapper.ts\n\trenamed: src/app/services/Repositorys/Agenda/mapper/EventListMapper.ts -> src/app/module/agenda/domain/mapper/EventListMapper.ts\n\trenamed: src/app/services/Repositorys/Agenda/mapper/EventSearchMapper.ts -> src/app/module/agenda/domain/mapper/EventSearchMapper.ts\n\trenamed: src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts -> src/app/module/agenda/domain/mapper/EventToApproveDetailsMapper.ts\n\trenamed: src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts -> src/app/module/agenda/domain/mapper/eventToApproveListMapper.ts\n\trenamed: src/app/services/Repositorys/Agenda/utils.ts -> src/app/module/agenda/utils.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tdeleted: src/app/services/Repositorys/Agenda/agendaDataModels.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file