Skip to content

Commit

Permalink
Add Truth and Reconciliation Day to more provinces
Browse files Browse the repository at this point in the history
- BC has made it official
- Alberta lists it as optional
- Yukon, NWT, and Nunavut also made it official
  • Loading branch information
pcraig3 committed Apr 5, 2023
1 parent 1fd001e commit ef48eba
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 10 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [3.21.0] - 2022-02-13

### Updated

- Update the status of National Truth and Reconciliation Day
- BC changed it from optional to a provincial holiday
- Yukon, NWT, and Nunavut all made it a provincial holiday
- Alberta mentions it as an optional holiday now

## [3.20.2] - 2022-02-13

### Updated
Expand Down
6 changes: 5 additions & 1 deletion migrations/001-db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,13 @@ INSERT INTO ProvinceHoliday (holidayId, provinceId, optional) VALUES ((SELECT id
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 19' AND nameEn = 'Day of Mourning for Queen Elizabeth II')), 'PE');
INSERT INTO ProvinceHoliday (holidayId, provinceId, optional) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 19' AND nameEn = 'Day of Mourning for Queen Elizabeth II')), 'YT', 1);

INSERT INTO ProvinceHoliday (holidayId, provinceId, optional) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'BC', 1);
INSERT INTO ProvinceHoliday (holidayId, provinceId, optional) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'AB', 1);
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'BC');
INSERT INTO ProvinceHoliday (holidayId, provinceId, optional) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'MB', 1);
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'NT');
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'NU');
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'PE');
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'September 30' AND nameEn = 'National Day for Truth and Reconciliation')), 'YT');

INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'Second Monday in October' AND nameEn = 'Thanksgiving')), 'AB');
INSERT INTO ProvinceHoliday (holidayId, provinceId) VALUES ((SELECT id FROM Holiday WHERE (date = 'Second Monday in October' AND nameEn = 'Thanksgiving')), 'BC');
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hols",
"version": "3.20.2",
"version": "3.21.0",
"description": "hols for cans: canada holidays api and canada holidays frontend",
"main": "index.js",
"author": "pcraig3",
Expand Down
12 changes: 6 additions & 6 deletions src/routes/__tests__/api.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,18 @@ describe('Test /api responses', () => {
test('it should return the right number of holidays per province', async () => {
const provinceHolidayLength = {
AB: 9,
BC: 10,
BC: 11,
MB: 8,
NB: 8,
NL: 12,
NS: 6,
NT: 10,
NU: 10,
NT: 11,
NU: 11,
ON: 9,
PE: 8,
QC: 8,
SK: 10,
YT: 10,
YT: 11,
}

const response = await request(app).get('/api/v1/provinces')
Expand Down Expand Up @@ -198,11 +198,11 @@ describe('Test /api responses', () => {
{
province: 'AB',
statTotal: 9,
optionalTotal: 12,
optionalTotal: 13,
},
{
province: 'BC',
statTotal: 10,
statTotal: 11,
optionalTotal: 13,
},
{
Expand Down

0 comments on commit ef48eba

Please sign in to comment.