fix: added handling for date format

wzarek · May 10, 2024 · b8be3e8 · b8be3e8
1 parent c785603
commit b8be3e8
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 5 deletions.
diff --git a/Client/reasn-client/packages/common/__tests__/models/CommentDto.test.ts b/Client/reasn-client/packages/common/__tests__/models/CommentDto.test.ts
@@ -117,5 +117,62 @@ describe('CommentDto', () => {
             expect(() => CommentDtoMapper.fromObject(objectWithoutCreatedAt)).toThrow(ModelMappingError)
             expect(() => CommentDtoMapper.fromObject(objectWithoutUserId)).toThrow(ModelMappingError)
         })
+
+        it('should throw an error if date is in incorrect format', () => {
+            const object = {
+                EventId: eventId,
+                Content: content,
+                CreatedAt: 'invalid date',
+                UserId: userId
+            }
+
+            const objectMissingZ = {
+                EventId: eventId,
+                Content: content,
+                CreatedAt: '2009-06-15T13:45:30.0000000',
+                UserId: userId
+            }
+
+            expect(() => CommentDtoMapper.fromObject(object)).toThrow(ModelMappingError)
+            expect(() => CommentDtoMapper.fromObject(objectMissingZ)).toThrow(ModelMappingError)
+        })
+
+        it('should properly parse date string', () => {
+            const object = {
+                EventId: eventId,
+                Content: content,
+                CreatedAt: '2009-06-15T13:45:30.0000000-07:00',
+                UserId: userId
+            }
+
+            const objectWithoutOffset = {
+                EventId: eventId,
+                Content: content,
+                CreatedAt: '2009-06-15T13:45:30.0000000Z',
+                UserId: userId
+            }
+
+            const objectWithoutMilliseconds = {
+                EventId: eventId,
+                Content: content,
+                CreatedAt: '2009-06-15T13:45:30Z',
+                UserId: userId
+            }
+
+            let comment = CommentDtoMapper.fromObject(object)
+            comment = comment as CommentDto
+
+            expect(comment.CreatedAt).toEqual(new Date('2009-06-15T13:45:30.0000000-07:00'))
+
+            comment = CommentDtoMapper.fromObject(objectWithoutOffset)
+            comment = comment as CommentDto
+
+            expect(comment.CreatedAt).toEqual(new Date('2009-06-15T13:45:30.0000000Z'))
+
+            comment = CommentDtoMapper.fromObject(objectWithoutMilliseconds)
+            comment = comment as CommentDto
+
+            expect(comment.CreatedAt).toEqual(new Date('2009-06-15T13:45:30Z'))
+        })
     })
 })
diff --git a/Client/reasn-client/packages/common/models/CommentDto.ts b/Client/reasn-client/packages/common/models/CommentDto.ts
@@ -4,7 +4,7 @@ import { z } from "zod"
 export const CommentDtoSchema = z.object({
     EventId: z.number(),
     Content: z.string(),
-    CreatedAt: z.string().or(z.date()).transform(arg => new Date(arg)),
+    CreatedAt: z.string().datetime({ offset: true }).or(z.date()).transform(arg => new Date(arg)),
     UserId: z.number()
 })
 

diff --git a/Client/reasn-client/packages/common/models/EventDto.ts b/Client/reasn-client/packages/common/models/EventDto.ts
@@ -7,10 +7,10 @@ export const EventDtoSchema = z.object({
     AddressId: z.number(),
     Description: z.string(),
     OrganizerId: z.number(),
-    StartAt: z.string().or(z.date()).transform(arg => new Date(arg)),
-    EndAt: z.string().or(z.date()).transform(arg => new Date(arg)),
-    CreatedAt: z.string().or(z.date()).transform(arg => new Date(arg)),
-    UpdatedAt: z.string().or(z.date()).transform(arg => new Date(arg)),
+    StartAt: z.string().datetime({ offset: true }).or(z.date()).transform(arg => new Date(arg)),
+    EndAt: z.string().datetime({ offset: true }).or(z.date()).transform(arg => new Date(arg)),
+    CreatedAt: z.string().datetime({ offset: true }).or(z.date()).transform(arg => new Date(arg)),
+    UpdatedAt: z.string().datetime({ offset: true }).or(z.date()).transform(arg => new Date(arg)),
     Slug: z.string().nullable(),
     StatusId: z.number(),
     Tags: z.array(TagDtoSchema)