ryanmwangi
/
CalMerger
1
0
Fork 1
Code Issues 2 Pull Requests Releases Activity

fix:handle timebased events

This commit is contained in:
Ryan Mwangi 2024-11-13 02:54:42 +03:00
parent d08d87f47c
commit 2e9de0749d
3 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calendarUtil.js
View File

@ -50,17 +50,27 @@ export function addEventsToCalendar(calendarComponent, results) {
const endDate = vevent.endDate; const endDate = vevent.endDate;
// Create new ICAL.Time objects for start and end dates // Create new ICAL.Time objects for start and end dates
const startTime = new ICAL.Time(); const startTime = new ICAL.Time({
startTime.year = startDate.year; year: startDate.year,
startTime.month = startDate.month; month: startDate.month,
startTime.day = startDate.day; day: startDate.day,
startTime.isDate = true; // Set as all-day event hour: startDate.isDate ? null : startDate.hour,
minute: startDate.isDate ? null : startDate.minute,
second: startDate.isDate ? null : startDate.second,
zone: startDate.zone
});
startTime.isDate = startDate.isDate;
const endTime = new ICAL.Time(); const endTime = new ICAL.Time({
endTime.year = endDate.year; year: endDate.year,
endTime.month = endDate.month; month: endDate.month,
endTime.day = endDate.day; day: endDate.day,
endTime.isDate = true; // Set as all-day event hour: endDate.isDate ? null : endDate.hour,
minute: endDate.isDate ? null : endDate.minute,
second: endDate.isDate ? null : endDate.second,
zone: endDate.zone
});
endTime.isDate = endDate.isDate;
// Retain the existing DTSTAMP from vevent // Retain the existing DTSTAMP from vevent
const dtstampProperty = event.getFirstProperty('dtstamp'); const dtstampProperty = event.getFirstProperty('dtstamp');

52
test/calendar.test.js
View File

@ -92,37 +92,33 @@ describe('Calendar Merging API', () => {
// expect(actualOutput).toBe(expectedOutput); // expect(actualOutput).toBe(expectedOutput);
// }); // });
// test('Merge time-based calendar', async () => { test('Merge time-based calendar', async () => {
// const response = await request(server) const input = loadCalendarFile('work_task_calendar.ics');
// .post('/merge') const response = await request(server)
// .send({ .post('/merge')
// linkGroupName: 'Time Based Calendar', .send({
// calendars: [ linkGroupName: 'Time Based Calendar',
// { calendars: [
// url: loadCalendarFile('team_meeting_calendar.ics'), {
// prefix: 'team_meeting_calendar', url: input,
// override: false, prefix: 'work_task',
// }, override: false,
// { },
// url: loadCalendarFile('work_task_calendar.ics'), ],
// prefix: 'work_task', });
// override: false,
// },
// ],
// });
// expect(response.status).toBe(200); expect(response.status).toBe(200);
// expect(response.body.url).toMatch(/calendar\/Time_Based_Calendar/); expect(response.body.url).toMatch(/calendar\/Time_Based_Calendar/);
// // Check if the file was created in the test directory // Check if the file was created in the test directory
// const filePath = path.join(CALENDARS_DIR, 'Time_Based_Calendar.ics'); const filePath = path.join(CALENDARS_DIR, 'Time_Based_Calendar.ics');
// expect(fs.existsSync(filePath)).toBe(true); expect(fs.existsSync(filePath)).toBe(true);
// // Load expected output and compare // Load expected output and compare
// const expectedOutput = loadExpectedOutput('Time_Based_Calendar.ics'); const expectedOutput = fs.readFileSync(input, 'utf8');
// const actualOutput = fs.readFileSync (filePath, 'utf8'); const actualOutput = fs.readFileSync(filePath, 'utf8');
// expect(actualOutput).toBe(expectedOutput); expect(actualOutput).toBe(expectedOutput);
// }); });
// test('Merge calendar without prefix', async () => { // test('Merge calendar without prefix', async () => {
// const response = await request(server) // const response = await request(server)

6
test/test_calendars/work_task_calendar.ics
View File

@ -1,15 +1,11 @@
BEGIN:VCALENDAR BEGIN:VCALENDAR
NAME:Time Based Calendar
VERSION:2.0 VERSION:2.0
PRODID:-//Example Corp//NONSGML Event//EN
BEGIN:VEVENT BEGIN:VEVENT
UID:20231108T090000-001@example.com UID:20231108T090000-001@example.com
DTSTAMP:20231108T090000Z DTSTAMP:20231108T090000Z
DTSTART:20231108T090000Z DTSTART:20231108T090000Z
DTEND:20231108T100000Z DTEND:20231108T100000Z
SUMMARY:Work Task SUMMARY:Work Task
DESCRIPTION:Time-based work task event.
LOCATION:Office
STATUS:CONFIRMED
SEQUENCE:0
END:VEVENT END:VEVENT
END:VCALENDAR END:VCALENDAR