@@ -16,8 +16,8 @@ import type { GetEventInstancesAPIResponse } from './gen_types/GetEventInstances
1616import type { ID } from './gen_types/ID'
1717import type { UpdateEventRequestBody } from './gen_types/UpdateEventRequestBody'
1818import {
19- convertEventDates ,
20- convertInstanceDates ,
19+ replaceEventStringsToDates ,
20+ replaceInstanceStringsToDates ,
2121} from './helpers/datesConverters'
2222
2323/**
@@ -49,10 +49,9 @@ export class NitteiEventClient extends NitteiBaseClient {
4949 `/user/events/${ eventId } ` ,
5050 data
5151 )
52+ replaceEventStringsToDates ( res . event )
5253
53- return {
54- event : convertEventDates ( res . event ) ,
55- }
54+ return res
5655 }
5756
5857 /**
@@ -70,9 +69,9 @@ export class NitteiEventClient extends NitteiBaseClient {
7069 data
7170 )
7271
73- return {
74- event : convertEventDates ( res . event ) ,
75- }
72+ replaceEventStringsToDates ( res . event )
73+
74+ return res
7675 }
7776
7877 /**
@@ -91,9 +90,11 @@ export class NitteiEventClient extends NitteiBaseClient {
9190 data
9291 )
9392
94- return {
95- events : res . events . map ( convertEventDates ) ,
93+ for ( const event of res . events ) {
94+ replaceEventStringsToDates ( event )
9695 }
96+
97+ return res
9798 }
9899
99100 /**
@@ -104,9 +105,9 @@ export class NitteiEventClient extends NitteiBaseClient {
104105 public async getById ( eventId : ID ) : Promise < CalendarEventResponse > {
105106 const res = await this . get < CalendarEventResponse > ( `/user/events/${ eventId } ` )
106107
107- return {
108- event : convertEventDates ( res . event ) ,
109- }
108+ replaceEventStringsToDates ( res . event )
109+
110+ return res
110111 }
111112
112113 /**
@@ -123,9 +124,11 @@ export class NitteiEventClient extends NitteiBaseClient {
123124 `/user/events/external_id/${ externalId } `
124125 )
125126
126- return {
127- events : res . events . map ( convertEventDates ) ,
127+ for ( const event of res . events ) {
128+ replaceEventStringsToDates ( event )
128129 }
130+
131+ return res
129132 }
130133
131134 /**
@@ -142,9 +145,11 @@ export class NitteiEventClient extends NitteiBaseClient {
142145 options
143146 )
144147
145- return {
146- events : res . events . map ( convertEventDates ) ,
148+ for ( const event of res . events ) {
149+ replaceEventStringsToDates ( event )
147150 }
151+
152+ return res
148153 }
149154
150155 /**
@@ -162,12 +167,14 @@ export class NitteiEventClient extends NitteiBaseClient {
162167 body
163168 )
164169
165- return {
166- events : res . events . map ( e => ( {
167- event : convertEventDates ( e . event ) ,
168- instances : e . instances . map ( convertInstanceDates ) ,
169- } ) ) ,
170+ for ( const event of res . events ) {
171+ replaceEventStringsToDates ( event . event )
172+ for ( const instance of event . instances ) {
173+ replaceInstanceStringsToDates ( instance )
174+ }
170175 }
176+
177+ return res
171178 }
172179
173180 public async findByMeta (
@@ -185,9 +192,11 @@ export class NitteiEventClient extends NitteiBaseClient {
185192 value : meta . value ,
186193 } )
187194
188- return {
189- events : res . events . map ( convertEventDates ) ,
195+ for ( const event of res . events ) {
196+ replaceEventStringsToDates ( event )
190197 }
198+
199+ return res
191200 }
192201
193202 public async remove ( eventId : ID ) {
@@ -216,10 +225,12 @@ export class NitteiEventClient extends NitteiBaseClient {
216225 }
217226 )
218227
219- return {
220- event : convertEventDates ( res . event ) ,
221- instances : res . instances . map ( convertInstanceDates ) ,
228+ replaceEventStringsToDates ( res . event )
229+ for ( const instance of res . instances ) {
230+ replaceInstanceStringsToDates ( instance )
222231 }
232+
233+ return res
223234 }
224235}
225236
@@ -243,9 +254,9 @@ export class NitteiEventUserClient extends NitteiBaseClient {
243254 data
244255 )
245256
246- return {
247- event : convertEventDates ( res . event ) ,
248- }
257+ replaceEventStringsToDates ( res . event )
258+
259+ return res
249260 }
250261
251262 /**
@@ -263,27 +274,27 @@ export class NitteiEventUserClient extends NitteiBaseClient {
263274 data
264275 )
265276
266- return {
267- event : convertEventDates ( res . event ) ,
268- }
277+ replaceEventStringsToDates ( res . event )
278+
279+ return res
269280 }
270281
271282 public async create (
272283 data : CreateEventRequestBody
273284 ) : Promise < CalendarEventResponse > {
274285 const res = await this . post < CalendarEventResponse > ( '/events' , data )
275286
276- return {
277- event : convertEventDates ( res . event ) ,
278- }
287+ replaceEventStringsToDates ( res . event )
288+
289+ return res
279290 }
280291
281292 public async findById ( eventId : ID ) : Promise < CalendarEventResponse > {
282293 const res = await this . get < CalendarEventResponse > ( `/events/${ eventId } ` )
283294
284- return {
285- event : convertEventDates ( res . event ) ,
286- }
295+ replaceEventStringsToDates ( res . event )
296+
297+ return res
287298 }
288299
289300 public async remove ( eventId : ID ) {
@@ -302,9 +313,11 @@ export class NitteiEventUserClient extends NitteiBaseClient {
302313 }
303314 )
304315
305- return {
306- event : convertEventDates ( res . event ) ,
307- instances : res . instances . map ( convertInstanceDates ) ,
316+ replaceEventStringsToDates ( res . event )
317+ for ( const instance of res . instances ) {
318+ replaceInstanceStringsToDates ( instance )
308319 }
320+
321+ return res
309322 }
310323}
0 commit comments