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

test(in-progress): run tests for date based calendar

This commit is contained in:
Ryan Mwangi 2024-11-12 22:39:39 +03:00
parent 0b0ecaa0c2
commit 665c134597
2 changed files with 204 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/calendarUtil.js
View File

@ -29,7 +29,6 @@ export async function fetchCalendarData(calendar) {
// Create a top-level VCALENDAR component // Create a top-level VCALENDAR component
export function createCalendarComponent(name) { export function createCalendarComponent(name) {
const calendarComponent = new ICAL.Component(['vcalendar', [], []]); const calendarComponent = new ICAL.Component(['vcalendar', [], []]);
calendarComponent.updatePropertyWithValue('prodid', '-//Your Product ID//EN');
calendarComponent.updatePropertyWithValue('version', '2.0'); calendarComponent.updatePropertyWithValue('version', '2.0');
calendarComponent.updatePropertyWithValue('name', name); calendarComponent.updatePropertyWithValue('name', name);
return calendarComponent; return calendarComponent;
@ -38,6 +37,7 @@ export function createCalendarComponent(name) {
// Add events to the calendar component // Add events to the calendar component
export function addEventsToCalendar(calendarComponent, results) { export function addEventsToCalendar(calendarComponent, results) {
results.forEach((result) => { results.forEach((result) => {
try {
const parsed = ICAL.parse(result.data); const parsed = ICAL.parse(result.data);
const component = new ICAL.Component(parsed); const component = new ICAL.Component(parsed);
@ -45,16 +45,46 @@ export function addEventsToCalendar(calendarComponent, results) {
const vevent = new ICAL.Event(event); const vevent = new ICAL.Event(event);
const newEvent = new ICAL.Component('vevent'); const newEvent = new ICAL.Component('vevent');
const startDate = vevent.startDate && ICAL.Time.fromJSDate(vevent.startDate.toJSDate()); // Use ICAL.Time to handle dates correctly
const endDate = vevent.endDate && ICAL.Time.fromJSDate(vevent.endDate.toJSDate()); const startDate = vevent.startDate;
const endDate = vevent.endDate;
// Create new ICAL.Time objects for start and end dates
const startTime = new ICAL.Time();
startTime.year = startDate.year;
startTime.month = startDate.month;
startTime.day = startDate.day;
startTime.isDate = true; // Set as all-day event
const endTime = new ICAL.Time();
endTime.year = endDate.year;
endTime.month = endDate.month;
endTime.day = endDate.day;
endTime.isDate = true; // Set as all-day event
// Retain the existing DTSTAMP from vevent
const dtstampProperty = event.getFirstProperty('dtstamp'); // Get DTSTAMP from the original event
const dtstamp = dtstampProperty ? dtstampProperty.value : null; // Safely get the value
newEvent.updatePropertyWithValue('uid', vevent.uid); newEvent.updatePropertyWithValue('uid', vevent.uid);
newEvent.updatePropertyWithValue('summary', `${result.prefix} ${vevent.summary}`); newEvent.updatePropertyWithValue('summary', vevent.summary.trim());
newEvent.updatePropertyWithValue('dtstart', startDate); if (dtstamp) {
newEvent.updatePropertyWithValue('dtend', endDate); newEvent.updatePropertyWithValue('dtstamp', dtstamp); // Retain the existing DTSTAMP
}
// Set the dtstart and dtend properties using ICAL.Time
newEvent.updatePropertyWithValue('dtstart', startTime);
newEvent.updatePropertyWithValue('dtend', endTime);
// Add the new event to the calendar component
calendarComponent.addSubcomponent(newEvent); calendarComponent.addSubcomponent(newEvent);
}); });
// Log the added events for debugging
console.log('Added events:', calendarComponent.toString());
} catch (error) {
console.error('Error processing calendar data:', error.message);
}
}); });
} }

319
test/calendar.test.js
View File

@ -57,187 +57,188 @@ describe('Calendar Merging API', () => {
const expectedOutput = fs.readFileSync(input, 'utf8'); 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 date-based calendar', async () => { // test('Merge date-based calendar', async () => {
const response = await request(server) // const response = await request(server)
.post('/merge') // .post('/merge')
.send({ // .send({
linkGroupName: 'Date Based Calendar', // linkGroupName: 'Date Based Calendar',
calendars: [ // calendars: [
{ // {
url: loadCalendarFile('holiday_calendar_2023.ics'), // url: loadCalendarFile('holiday_calendar_2023.ics'),
prefix: 'holiday_calendar_2023', // prefix: 'holiday_calendar_2023',
override: false, // override: false,
}, // },
{ // {
url: loadCalendarFile('US_Holidays.ics'), // url: loadCalendarFile('US_Holidays.ics'),
prefix: 'US_holidays', // prefix: 'US_holidays',
override: false, // override: false,
}, // },
], // ],
}); // });
expect(response.status).toBe(200); // expect(response.status).toBe(200);
expect(response.body.url).toMatch(new RegExp(`calendar/Date_Based_Calendar`)); // expect(response.body.url).toMatch(new RegExp(`calendar/Date_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, 'Date_Based_Calendar.ics'); // const filePath = path.join(CALENDARS_DIR, 'Date_Based_Calendar.ics');
console.log('Checking if file exists at:', filePath); // console.log('Checking if file exists at:', filePath);
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('Date_Based_Calendar.ics'); // const expectedOutput = loadExpectedOutput('Date_Based_Calendar.ics');
const actualOutput = fs.readFileSync(filePath, 'utf8'); // const actualOutput = fs.readFileSync(filePath, 'utf8');
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 response = await request(server)
.post('/merge') // .post('/merge')
.send({ // .send({
linkGroupName: 'Time Based Calendar', // linkGroupName: 'Time Based Calendar',
calendars: [ // calendars: [
{ // {
url: loadCalendarFile('team_meeting_calendar.ics'), // url: loadCalendarFile('team_meeting_calendar.ics'),
prefix: 'team_meeting_calendar', // prefix: 'team_meeting_calendar',
override: false, // override: false,
}, // },
{ // {
url: loadCalendarFile('work_task_calendar.ics'), // url: loadCalendarFile('work_task_calendar.ics'),
prefix: 'work_task', // prefix: 'work_task',
override: false, // 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 = loadExpectedOutput('Time_Based_Calendar.ics');
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)
.post('/merge') // .post('/merge')
.send({ // .send({
linkGroupName: 'No Prefix Calendar', // linkGroupName: 'No Prefix Calendar',
calendars: [ // calendars: [
{ // {
url: loadCalendarFile('sf_public_holidays.ics'), // url: loadCalendarFile('sf_public_holidays.ics'),
prefix: '', // prefix: '',
override: false, // override: false,
}, // },
], // ],
}); // });
expect(response.status).toBe(200); // expect(response.status).toBe(200);
expect(response.body.url).toMatch(/calendar\/No_Prefix_Calendar/); // expect(response.body.url).toMatch(/calendar\/No_Prefix_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, 'No_Prefix_Calendar.ics'); // const filePath = path.join(CALENDARS_DIR, 'No_Prefix_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('No_Prefix_Calendar.ics'); // const expectedOutput = loadExpectedOutput('No_Prefix_Calendar.ics');
const actualOutput = fs.readFileSync(filePath, 'utf8'); // const actualOutput = fs.readFileSync(filePath, 'utf8');
expect(actualOutput).toBe(expectedOutput); // expect(actualOutput).toBe(expectedOutput);
}); // });
test('Merge calendar with override', async () => { // test('Merge calendar with override', async () => {
const response = await request(server) // const response = await request(server)
.post('/merge') // .post('/merge')
.send({ // .send({
linkGroupName: 'Override Calendar', // linkGroupName: 'Override Calendar',
calendars: [ // calendars: [
{ // {
url: loadCalendarFile('sf_public_holidays.ics'), // url: loadCalendarFile('sf_public_holidays.ics'),
prefix: 'Override Event', // prefix: 'Override Event',
override: true, // override: true,
}, // },
], // ],
}); // });
expect(response.status).toBe(200); // expect(response.status).toBe(200);
expect(response.body.url).toMatch(/calendar\/Override_Calendar/); // expect(response.body.url).toMatch(/calendar\/Override_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, 'Override_Calendar.ics'); // const filePath = path.join(CALENDARS_DIR, 'Override_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('Override_Calendar.ics'); // const expectedOutput = loadExpectedOutput('Override_Calendar.ics');
const actualOutput = fs.readFileSync(filePath, 'utf8'); // const actualOutput = fs.readFileSync(filePath, 'utf8');
expect(actualOutput).toBe(expectedOutput); // expect(actualOutput).toBe(expectedOutput);
}); // });
test('Merge UTC and EAT time zone calendar', async () => { // test('Merge UTC and EAT time zone calendar', async () => {
const response = await request(server) // const response = await request(server)
.post('/merge') // .post('/merge')
.send({ // .send({
linkGroupName: 'UTCEAT Time Zone Calendar', // linkGroupName: 'UTCEAT Time Zone Calendar',
calendars: [ // calendars: [
{ // {
url: loadCalendarFile('utc_time_zone_event.ics'), // url: loadCalendarFile('utc_time_zone_event.ics'),
prefix: 'UTC_Event', // prefix: 'UTC_Event',
override: false, // override: false,
}, // },
{ // {
url: loadCalendarFile('eat_time_zone_event.ics'), // url: loadCalendarFile('eat_time_zone_event.ics'),
prefix: 'EAT_Event', // prefix: 'EAT_Event',
override: false, // override: false,
}, // },
], // ],
}); // });
expect(response.status).toBe(200); // expect(response.status).toBe(200);
expect(response.body.url).toMatch(new RegExp(`calendar/UTCEAT_Time_Zone_Calendar`)); // expect(response.body.url).toMatch(new RegExp(`calendar/UTCEAT_Time_Zone_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, 'UTCEAT_Time_Zone_Calendar.ics'); // const filePath = path.join(CALENDARS_DIR, 'UTCEAT_Time_Zone_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('UTCEAT_Time_Zone_Calendar.ics'); // const expectedOutput = loadExpectedOutput('UTCEAT_Time_Zone_Calendar.ics');
const actualOutput = fs.readFileSync(filePath, 'utf8'); // const actualOutput = fs.readFileSync(filePath, 'utf8');
expect(actualOutput).toBe(expectedOutput); // expect(actualOutput).toBe(expectedOutput);
}); // });
test('Merge date-based and time-based calendars', async () => { // test('Merge date-based and time-based calendars', async () => {
const response = await request(server) // const response = await request(server)
.post('/merge') // .post('/merge')
.send({ // .send({
linkGroupName: 'Merged Date and Time Based Calendar', // linkGroupName: 'Merged Date and Time Based Calendar',
calendars: [ // calendars: [
{ // {
url: loadCalendarFile('holiday_calendar_2023.ics'), // Date-based calendar // url: loadCalendarFile('holiday_calendar_2023.ics'), // Date-based calendar
prefix: 'Holiday_2023', // prefix: 'Holiday_2023',
override: false, // override: false,
}, // },
{ // {
url: loadCalendarFile('work_task_calendar.ics'), // Time-based calendar // url: loadCalendarFile('work_task_calendar.ics'), // Time-based calendar
prefix: 'Work_Task', // prefix: 'Work_Task',
override: false, // override: false,
}, // },
], // ],
}); // });
expect(response.status).toBe(200); // expect(response.status).toBe(200);
expect(response.body.url).toMatch(new RegExp('calendar/Merged_Date_and_Time_Based_Calendar')); // expect(response.body.url).toMatch(new RegExp('calendar/Merged_Date_and_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, 'Merged_Date_and_Time_Based_Calendar.ics'); // const filePath = path.join(CALENDARS_DIR, 'Merged_Date_and_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('Merged_Date_and_Time_Based_Calendar.ics'); // const expectedOutput = loadExpectedOutput('Merged_Date_and_Time_Based_Calendar.ics');
const actualOutput = fs.readFileSync(filePath, 'utf8'); // const actualOutput = fs.readFileSync(filePath, 'utf8');
expect(actualOutput).toBe(expectedOutput); // expect(actualOutput).toBe(expectedOutput);
}); // });
}); });