fix: parse calendar dates as utc before iso (#100)

This commit is contained in:
Rickard Natt och Dag 2021-03-30 17:42:05 +02:00 committed by GitHub
parent 2926de31fe
commit 73f6d8ba72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 13 deletions

View File

@ -91,23 +91,52 @@ describe('parse', () => {
ListId: null,
Mentor: null,
},
{
Title: 'Utvecklingsdag, förskolorna är stängda',
Id: 5,
Description: null,
Location: null,
EventDate: '2021-05-28',
EventDateTime: '',
LongEventDateTime: '2021-05-28',
EndDate: '2021-05-28',
EndDateTime: '',
LongEndDateTime: '2021-05-28',
EventDateDayNumber: '28',
EventDateMonthName: 'maj',
EventDateMonthFullName: 'maj',
FullDateDescription: '2021-05-28 - 2021-05-28',
IsSameDay: true,
AllDayEvent: true,
ListId: null,
Mentor: null,
},
],
}
})
it('parses calendar correctly', () => {
expect(parse.calendar(response)).toEqual([
{
id: 29,
location: null,
title: 'Jullov',
description: 'hello',
startDate: '2020-12-21T09:00:00.000+01:00',
endDate: '2021-01-08T10:00:00.000+01:00',
allDay: false,
},
])
const [firstEvent] = parse.calendar(response)
expect(firstEvent).toEqual({
id: 29,
location: null,
title: 'Jullov',
description: 'hello',
startDate: '2020-12-21T08:00:00.000Z',
endDate: '2021-01-08T09:00:00.000Z',
allDay: false,
})
})
it('parses start and end date without time', () => {
const [, secondEvent] = parse.calendar(response)
expect(secondEvent.startDate).toEqual('2021-05-27T22:00:00.000Z')
expect(secondEvent.endDate).toEqual('2021-05-27T22:00:00.000Z')
})
})
describe('classmates', () => {
beforeEach(() => {
response = {

View File

@ -116,10 +116,10 @@ export const calendarItem = ({
location,
allDay: allDayEvent,
startDate: longEventDateTime
? DateTime.fromSQL(longEventDateTime, dateTimeOptions).toISO()
? DateTime.fromSQL(longEventDateTime, dateTimeOptions).toUTC().toISO()
: undefined,
endDate: longEndDateTime
? DateTime.fromSQL(longEndDateTime, dateTimeOptions).toISO()
? DateTime.fromSQL(longEndDateTime, dateTimeOptions).toUTC().toISO()
: undefined,
})
export const calendar = (data: any): CalendarItem[] =>