diff --git a/src/app/interceptors/metter.interceptor.ts b/src/app/interceptors/metter.interceptor.ts index 1796a2eb9..035829253 100644 --- a/src/app/interceptors/metter.interceptor.ts +++ b/src/app/interceptors/metter.interceptor.ts @@ -37,6 +37,8 @@ export class MetricsInterceptor implements HttpInterceptor { if (event instanceof HttpResponse) { // Capture the status code and check protocol if (req.method !== 'GET' && !req.urlWithParams.includes('metrics')) { + + console.log('response', event.body) const path = req.urlWithParams; const url = new URL(path); if (window.location.protocol !== 'https:') { diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index 1156f07ff..fbc629df1 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -123,7 +123,7 @@ export class ViewEventPage implements OnInit { ev.target.complete(); } - @XTracerAsync({name:'ViewEventPage/loadEvent', bugPrint: true}) + @XTracerAsync({name:'mobile/loadEvent', bugPrint: true}) async loadEvent(tracing?: TracingType) { const loader = this.toastService.loading(); diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 6a5235848..79fe7e5aa 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -678,7 +678,7 @@ export class AgendaPage implements OnInit { }); }; - @XTracerAsync({name:'AgendaPage/loadRangeEventRun', bugPrint: true}) + @XTracerAsync({name:'AgendaPage/loadRange', bugPrint: true}) async loadRangeEventRun(startTime: Date, endTime: Date, tracing?: TracingType) { tracing.addEvent('load range start') 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 0f43b0509..c8c28758a 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -459,7 +459,7 @@ export class EditEventPage implements OnInit { await this.saveDocument() if (this.addedAttachmentsList.length > 0) { - this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments).subscribe((value) => { + this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => { console.log(value) }, ((error) => { console.log('add attachment error: ', error) 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 bcdb5a6c0..6b9c71174 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 @@ -177,7 +177,7 @@ export class EventListPage implements OnInit { this.LoadToApproveEvents(); } - @XTracerAsync({name:'EventListPage/LoadToApproveEvents', bugPrint: true}) + @XTracerAsync({name:'EventListPage/LoadToApprove', bugPrint: true}) async LoadToApproveEvents(tracing?: TracingType) { console.log('aprove event') this.showLoader = true; diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts index 34b49f03c..5bb58b266 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts +++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts @@ -22,6 +22,7 @@ import { SharedCalendarListDetectChanges } from './async/change/shareCalendarCha import { SharedCalendarListItemOutputDTO } from './model/sharedCalendarOutputDTO'; import { EventInputDTOSchema } from './agendaDataModels'; import { EventUpdateInputDTOSchema } from './model/eventUpdateInputDtO'; +import { AttachInputDTOSchema } from './model/addAttachmentDTOInput'; @Injectable({ providedIn: 'root' @@ -221,16 +222,22 @@ export class AgendaDataRepositoryService { return this.agendaDataService.updateEvent(eventId, eventInput) } - addEventAttendee(id, attendeeData,) { + addEventAttendee(id, attendeeData) { console.log(attendeeData) console.log(this.utils.attendeesEdit(attendeeData)) + + return this.agendaDataService.addEventAttendee(id, { attendees: this.utils.attendeesAdded(attendeeData) }); } - addEventAttachment(id, attachmentData) { + addEventAttachment(id, attachmentData, tracing: TracingType) { console.log(attachmentData) - console.log('post attachment', this.utils.documentAdded(attachmentData)) - return this.agendaDataService.addEventAttachment(id, { attachments: this.utils.documentAdded(attachmentData) }); + + const attachments = { attachments: this.utils.documentAdded(attachmentData) } + console.log('post attachment', attachments) + + APINODReturn(AttachInputDTOSchema, attachments, `POST/${id}/Attendee`, tracing) + return this.agendaDataService.addEventAttachment(id, attachments); } deleteEvent(eventId,deleteAll) { diff --git a/src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts b/src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts new file mode 100644 index 000000000..e7fbe51e6 --- /dev/null +++ b/src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts @@ -0,0 +1,13 @@ +import { z } from 'zod'; + +export const AttachInputDTOSchema = z.object({ + attachments: z.array(z.object({ + docId: z.any(), + sourceName: z.any(), + description: z.any(), + applicationId: z.any(), + })) + +}) + +export type AttachInputDTO = z.infer diff --git a/src/app/services/Repositorys/Agenda/utils.ts b/src/app/services/Repositorys/Agenda/utils.ts index 9e6d3cca3..1e6b6234b 100644 --- a/src/app/services/Repositorys/Agenda/utils.ts +++ b/src/app/services/Repositorys/Agenda/utils.ts @@ -84,7 +84,7 @@ export class Utils { documents.forEach(element => { let object = { docId: element.docId || element.DocId, - sourceName: element.subject || element.sourceNames || element.Description, + sourceName: element.subject || element.sourceNames || element.Description || element.SourceNames, description: "", applicationId: element.applicationId || element.ApplicationId } diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 92879dd43..6e956f093 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -313,7 +313,7 @@ export class TaskService { } - @XTracerAsync({name:'taskService/loadEventosParaAprovacao', bugPrint: true}) + @XTracerAsync({name:'taskService/loadEventParaAprovacao', bugPrint: true}) async loadEventosParaAprovacao(tracing?: TracingType) { this.showLoaderNum++ console.log('PR') 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 878d60f41..ec413d206 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 @@ -392,7 +392,7 @@ export class EditEventToApprovePage implements OnInit { })); if (this.addedAttachmentsList.length > 0) { - this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments).subscribe((value) => { + this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => { console.log(value) }, ((error) => { this.showLoader = false 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 537a1042c..7f2981bb8 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -457,7 +457,7 @@ export class EditEventPage implements OnInit { if (this.addedAttachmentsList.length > 0) { - this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments).subscribe((value) => { + this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => { console.log(value) }, ((error) => { this.showLoader = false 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 2bb93f34e..698e9fa70 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 @@ -334,7 +334,7 @@ export class EditEventToApproveComponent implements OnInit { if (this.addedAttachmentsList.length > 0) { - this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments).subscribe((value) => { + this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => { console.log(value) }, ((error) => { this.showLoader = false diff --git a/version/git-version.ts b/version/git-version.ts index 539f95154..d785aa86a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "0c14b9be9", - "SHA": "0c14b9be979f22b13e627b978767be4a173d9768", + "shortSHA": "536548af0", + "SHA": "536548af0c7696fdc7384057cf856163459fe374", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jun 21 23:33:29 2024 +0100'", - "lastCommitMessage": "fix ownertype and category type", - "lastCommitNumber": "5836", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 7 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: angular.json\n\tmodified: src/app/interceptors/metter.interceptor.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\tmodified: src/app/services/Repositorys/Agenda/model/eventInputDTO.ts\n\tmodified: src/app/services/Repositorys/Agenda/model/eventListDTOOutput.ts\n\tmodified: src/app/services/Repositorys/Agenda/model/eventToApproveListOutputDTO.ts\n\tnew file: src/app/services/Repositorys/Agenda/model/eventUpdateInputDtO.ts\n\tmodified: src/app/services/monitoring/opentelemetry/tracer.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/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Sat Jun 22 13:28:14 2024 +0100'", + "lastCommitMessage": "ITOTEAM-525 send the rigth category and ownertype", + "lastCommitNumber": "5837", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/interceptors/metter.interceptor.ts\n\tmodified: src/app/modals/view-event/view-event.page.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/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\tnew file: src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts\n\tmodified: src/app/services/Repositorys/Agenda/utils.ts\n\tmodified: src/app/services/task.service.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/gabinete-digital/edit-event-to-approve/edit-event.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file