Skip to content

refactor: occupation and occupation group cleanups #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
irumvanselme merged 1 commit into from
Mar 30, 2026
Merged

refactor: occupation and occupation group cleanups #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 54 additions & 84 deletions api-specifications/src/error/get.schema.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,18 @@ describe("Test the GetErrorSchema function", () => {
// THEN expect the function to return a valid schema object
test("APIError.GetErrorSchema returns a valid schema object", () => {
const schema = APIError.Schemas.getPayload("POST", "TestSchema", 500, [
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status500.ErrorCodes),
]);
expect(schema).toBeDefined();
expect(schema.type).toBe("object");
Expand All @@ -53,33 +47,27 @@ describe("Test the GetErrorSchema function", () => {
...Object.values(ImportAPI.Enums.ImportResponseErrorCodes),
...Object.values(ExportAPI.Enums.POST.Response.ExportResponseErrorCodes),
...Object.values(ModelInfoAPI.Enums.POST.Response.ErrorCodes),
...Object.values(OccupationGroupAPI.POSTAPISpecs.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.POSTAPISpecs.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.POSTAPISpecs.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(OccupationAPI.POSTOccupation.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.POSTOccupation.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.POSTOccupation.Errors.Status500.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.POST.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.POST.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.POST.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationAPI.POST.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.POST.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.POST.Errors.Status500.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status500.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.POST.Response.Status400.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.POST.Response.Status404.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.POST.Response.Status500.ErrorCodes),
Expand Down Expand Up @@ -125,45 +113,27 @@ describe("Validate JSON against the APIError GetErrorSchema function", () => {
...Object.values(ImportAPI.Enums.ImportResponseErrorCodes),
...Object.values(ExportAPI.Enums.POST.Response.ExportResponseErrorCodes),
...Object.values(ModelInfoAPI.Enums.POST.Response.ErrorCodes),
...Object.values(OccupationGroupAPI.POSTAPISpecs.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.POSTAPISpecs.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.POSTAPISpecs.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status500.ErrorCodes),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(OccupationAPI.POSTOccupation.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.POSTOccupation.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.POSTOccupation.Errors.Status500.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.POST.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.POST.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.POST.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationAPI.POST.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.POST.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.POST.Errors.Status500.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status500.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.POST.Response.Status400.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.POST.Response.Status404.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.POST.Response.Status500.ErrorCodes),
Expand Down
48 changes: 15 additions & 33 deletions api-specifications/src/error/schema.GET.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,39 +47,21 @@ describe("Validate JSON against the APIError GET Schema", () => {
...Object.values(ErrorConstants.Common.ErrorCodes),
...Object.values(ErrorConstants.GET.ErrorCodes),
...Object.values(ModelInfoAPI.Enums.GET.Response.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GETAPISpecs.Enums.Response.Status500.ErrorCodes),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETDetailAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETParentAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status400.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status404.ErrorCodes
),
...Object.values(
OccupationGroupAPI.GETDetailAPISpecs.GETChildrenAPISpecs.Enums.GET.Response.Status500.ErrorCodes
),
...Object.values(OccupationAPI.GETOccupations.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.GETOccupations.Errors.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.GET.Enums.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.GET.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Parent.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(OccupationGroupAPI.OccupationGroup.Children.Enums.GET.Response.Status500.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status400.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status404.ErrorCodes),
...Object.values(OccupationAPI.GET.Errors.Status500.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.GET.Response.Status400.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.GET.Response.Status404.ErrorCodes),
...Object.values(SkillGroupAPI.Enums.GET.Response.Status500.ErrorCodes),
Expand Down
Loading
Loading