From dbe13112878b8adac4f291ad946d98b00a631d3f Mon Sep 17 00:00:00 2001 From: kksteini Date: Wed, 3 Jul 2024 13:04:12 +0000 Subject: [PATCH 1/6] feat(application-dld): Entry requirements in DP --- .../src/lib/drivingLicense.service.ts | 42 + .../src/lib/drivingLicense.type.ts | 5 + .../driving-license-duplicate.service.ts | 18 + .../src/dataProviders/index.ts | 6 + .../sectionDataProviders.ts | 10 +- .../lib/drivingLicenseDuplicateTemplate.ts | 6 +- .../src/lib/drivingLicenseApi.types.ts | 1 + .../driving-license/src/v4/clientConfig.json | 2358 ++++++++++++++--- .../driving-license/src/v5/clientConfig.json | 1315 +++++++-- .../src/clientConfig.json | 598 ++++- 10 files changed, 3668 insertions(+), 691 deletions(-) diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts index 97093ce252d7..19b68dae4bff 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts @@ -14,6 +14,7 @@ import { ApplicationEligibilityRequirement, QualitySignatureResult, NewBEDrivingLicenseInput, + DrivinglicenseDuplicateValidityStatus, } from './drivingLicense.type' import { CanApplyErrorCodeBFull, @@ -384,6 +385,47 @@ export class DrivingLicenseService { }) } + async canGetNewDuplicate(params: { + token: string + }): Promise { + const { token } = params + const license = await this.drivingLicenseApi.getCurrentLicense({ + token, + }) + + if (license.comments?.some((comment) => comment?.nr == '400')) { + return { + canGetNewDuplicate: false, + summary: + 'Tákntala 400 fannst á ökuskírteini. Vinsamlegast hafðu samband við Sýslumann', + } + } + console.log( + '🚀 ~ DrivingLicenseService ~ canGetNewDuplicate ~ license:', + license, + ) + + const in_six_months = new Date( + new Date(Date.now()).setMonth(new Date().getMonth() + 6), + ) + + license.categories?.forEach((category) => { + if (category.expires === null || category.expires < in_six_months) { + return { + canGetNewDuplicate: false, + summary: + 'Ökuskírteini útrunnið eða rennur út eftir 6 mánuði fyrir ' + + category.name, + } + } + }) + + return { + canGetNewDuplicate: true, + summary: '', + } + } + async drivingLicenseDuplicateSubmission(params: { districtId: number token: string diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts index fdcda87b214e..bba2693ab477 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts @@ -47,6 +47,11 @@ export interface TeachingRightsStatus { hasTeachingRights: boolean } +export interface DrivinglicenseDuplicateValidityStatus { + canGetNewDuplicate: boolean + summary: string +} + export interface StudentQueryInput { nationalId: string } diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts index fdf9c65e7d99..27ff12300da4 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts @@ -8,6 +8,7 @@ import { ApplicationTypes } from '@island.is/application/types' import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { BaseTemplateApiService } from '../../base-template-api.service' +import { TemplateApiError } from '@island.is/nest/problem' @Injectable() export class DrivingLicenseDuplicateService extends BaseTemplateApiService { @@ -19,6 +20,23 @@ export class DrivingLicenseDuplicateService extends BaseTemplateApiService { super(ApplicationTypes.DRIVING_LICENSE_DUPLICATE) } + async canGetNewDuplicate({ auth }: TemplateApiModuleActionProps) { + const can = await this.drivingLicenseService.canGetNewDuplicate({ + token: auth.authorization, + }) + if (!can.canGetNewDuplicate) { + throw new TemplateApiError( + { + title: 'Ökuskírteini hæfir ekki umsókn um samrit', + description: '', + summary: can.summary, + defaultMessage: '', + }, + 400, + ) + } + } + async submitApplication({ application, auth, diff --git a/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts b/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts index 750644930ce7..f39af419ccca 100644 --- a/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts +++ b/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts @@ -1,6 +1,7 @@ import { InstitutionNationalIds, PaymentCatalogApi, + defineTemplateApi, } from '@island.is/application/types' export const SyslumadurPaymentCatalogApi = PaymentCatalogApi.configure({ @@ -9,3 +10,8 @@ export const SyslumadurPaymentCatalogApi = PaymentCatalogApi.configure({ }, externalDataId: 'payment', }) + +export const DuplicateEligibilityApi = defineTemplateApi({ + action: 'canGetNewDuplicate', + shouldPersistToExternalData: false, +}) diff --git a/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts b/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts index 3af2a23b5156..b8e44e5cd023 100644 --- a/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts +++ b/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts @@ -11,7 +11,10 @@ import { QualitySignatureApi, UserProfileApi, } from '@island.is/application/types' -import { SyslumadurPaymentCatalogApi } from '../../dataProviders' +import { + DuplicateEligibilityApi, + SyslumadurPaymentCatalogApi, +} from '../../dataProviders' export const sectionDataProviders = buildExternalDataProvider({ id: 'approveExternalData', @@ -50,6 +53,11 @@ export const sectionDataProviders = buildExternalDataProvider({ title: '', subTitle: '', }), + buildDataProviderItem({ + provider: DuplicateEligibilityApi, + title: '', + subTitle: '', + }), buildDataProviderItem({ provider: SyslumadurPaymentCatalogApi, title: '', diff --git a/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts b/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts index 1ed9a75ee568..81e4b7bde2c1 100644 --- a/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts +++ b/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts @@ -25,7 +25,10 @@ import { DrivingLicenseDuplicateFeatureFlags, getApplicationFeatureFlags, } from './getApplicationFeatureFlags' -import { SyslumadurPaymentCatalogApi } from '../dataProviders' +import { + DuplicateEligibilityApi, + SyslumadurPaymentCatalogApi, +} from '../dataProviders' import { coreHistoryMessages, getValueViaPath, @@ -121,6 +124,7 @@ const DrivingLicenseDuplicateTemplate: ApplicationTemplate< QualitySignatureApi, QualityPhotoApi, UserProfileApi, + DuplicateEligibilityApi, ], write: 'all', delete: true, diff --git a/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts b/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts index 1ec0c0be52ed..fa097fa8a40f 100644 --- a/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts +++ b/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts @@ -38,6 +38,7 @@ export interface DriversLicense { disqualification?: Disqualification | null birthCountry?: string | null publishPlaceName?: string | null + comments?: LicenseComments[] | null } export interface RemarkCode { diff --git a/libs/clients/driving-license/src/v4/clientConfig.json b/libs/clients/driving-license/src/v4/clientConfig.json index 082d23865387..13f9da7c22ba 100644 --- a/libs/clients/driving-license/src/v4/clientConfig.json +++ b/libs/clients/driving-license/src/v4/clientConfig.json @@ -3,10 +3,172 @@ "info": { "title": "RLS driver licence Rest API", "description": "RESTFul services for driver licences. Programmed in ASP.NET Core 3 API ", - "contact": { "name": "TMD", "email": "tmd@tmd.is" }, + "contact": { + "name": "TMD", + "email": "tmd@tmd.is" + }, "version": "4.0" }, "paths": { + "/api/applications/v4/applyfor/be": { + "post": { + "tags": ["Application"], + "summary": "Apply for BE category", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "requestBody": { + "description": "Application model", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PostApplicationForBEModel" + } + } + } + }, + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ApplicationForCategoryDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationForCategoryDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationForCategoryDto" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/applications/v4/testfinished/{applicationId}": { + "post": { + "tags": ["Application"], + "summary": "Confirm application as done, test finished", + "parameters": [ + { + "name": "applicationId", + "in": "path", + "description": "RLS application id", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ApplicationFinishedDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationFinishedDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationFinishedDto" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, "/api/codetables/deprivations": { "get": { "tags": ["Codetables"], @@ -17,14 +179,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -34,19 +202,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } } } @@ -64,14 +238,138 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } + } + } + } + } + } + } + }, + "/api/codetables/remarks": { + "get": { + "tags": ["Codetables"], + "summary": "Get types of remarks", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundAthugasemdaDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundAthugasemdaDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundAthugasemdaDto" + } + } + } + } + } + } + } + }, + "/api/codetables/districts": { + "get": { + "tags": ["Codetables"], + "summary": "Get for all districts", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -80,20 +378,497 @@ "content": { "text/plain": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "type": "array", + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } + } + } + } + } + } + } + }, + "/api/imagecontroller/{SSN}/hasqualityphoto": { + "get": { + "tags": ["Image"], + "summary": "Check if person has quality marked photo", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "application/json": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "text/json": { + "schema": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } + }, + "/api/imagecontroller/{SSN}/hasqualitysignature": { + "get": { + "tags": ["Image"], + "summary": "Check if person has quality marked photo", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "application/json": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "text/json": { + "schema": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } + }, + "/api/imagecontroller/{SSN}/getqualityphoto": { + "get": { + "tags": ["Image"], + "summary": "Get quality marked photo for person", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person id number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "application/json": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } + } + }, + "204": { + "description": "No Content" + } + } + } + }, + "/api/imagecontroller/{SSN}/getqualitysignature": { + "get": { + "tags": ["Image"], + "summary": "Get quality marked photo for person", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "application/json": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } + } + }, + "204": { + "description": "No Content" + } + } + } + }, + "/api/imagecontroller/{SSN}/fromnationalregistry": { + "get": { + "tags": ["Image"], + "summary": "Get for all images from thjodskra", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social serial number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ImagesFromThjodskraDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ImagesFromThjodskraDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ImagesFromThjodskraDto" + } + } + } + } + } + } + }, + "/api/licenseservice/v4/{SSN}/islicensevalid": { + "get": { + "tags": ["LicenseService"], + "summary": "Check if ssn has a valid license", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person's social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "boolean" + } + }, + "application/json": { + "schema": { + "type": "boolean" + } + }, + "text/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/licenseservice/v4/{SSN}/getlicense": { + "get": { + "tags": ["LicenseService"], + "summary": "Get person license by person social security number", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person's social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" } }, "application/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "$ref": "#/components/schemas/ProblemDetails" } }, "text/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -101,24 +876,40 @@ } } }, - "/api/codetables/remarks": { + "/api/licenseservice/v4/{id}": { "get": { - "tags": ["Codetables"], - "summary": "Get types of remarks", + "tags": ["LicenseService"], + "summary": "Get person license by license id", "parameters": [ + { + "name": "id", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -127,73 +918,37 @@ "content": { "text/plain": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TegundAthugasemdaDto" - } + "$ref": "#/components/schemas/DriverLicenseDto" } }, "application/json": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TegundAthugasemdaDto" - } + "$ref": "#/components/schemas/DriverLicenseDto" } }, "text/json": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TegundAthugasemdaDto" - } + "$ref": "#/components/schemas/DriverLicenseDto" } } } - } - } - } - }, - "/api/codetables/districts": { - "get": { - "tags": ["Codetables"], - "summary": "Get for all districts", - "parameters": [ - { - "name": "api-version", - "in": "header", - "description": "The requested API version", - "required": true, - "schema": { "type": "string", "default": "4.0" } }, - { - "name": "api-version", - "in": "query", - "description": "The requested API version", - "required": true, - "schema": { "type": "string", "default": "4.0" } - } - ], - "responses": { - "200": { - "description": "Success", + "404": { + "description": "Not Found", "content": { "text/plain": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "$ref": "#/components/schemas/ProblemDetails" } }, "application/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "$ref": "#/components/schemas/ProblemDetails" } }, "text/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -212,21 +967,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -234,13 +997,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } } } }, @@ -248,13 +1017,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -269,36 +1044,52 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -315,28 +1106,38 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "category", "in": "path", "description": "Category to check for (B, C, and so on)", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -373,28 +1174,38 @@ "in": "path", "description": "Category in license", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewFinalLicense" } + "schema": { + "$ref": "#/components/schemas/PostNewFinalLicense" + } } } }, @@ -403,13 +1214,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -417,13 +1237,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -440,21 +1266,29 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewCollaborative" } + "schema": { + "$ref": "#/components/schemas/PostNewCollaborative" + } } } }, @@ -463,13 +1297,22 @@ "description": "Created", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -477,13 +1320,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -500,21 +1349,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -522,13 +1379,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } } } } @@ -545,21 +1408,109 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "requestBody": { + "description": "Model of application", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PostTemporaryLicense" + } + } + } + }, + "responses": { + "201": { + "description": "Created", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + } + } + } + } + } + }, + "/api/drivinglicense/v4/applications/new/temporarywithhealthdeclaration": { + "post": { + "tags": ["Okuskirteini"], + "summary": "Apply for drivers license for a category", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostTemporaryLicense" } + "schema": { + "$ref": "#/components/schemas/PostTemporaryLicenseWithHealthDeclaration" + } } } }, @@ -618,14 +1569,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { @@ -692,21 +1649,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -714,13 +1679,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } } } } @@ -737,21 +1708,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -788,13 +1767,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -811,21 +1796,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -833,13 +1826,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -857,21 +1859,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -908,21 +1918,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -930,13 +1948,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -953,21 +1980,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -975,13 +2010,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -998,21 +2042,29 @@ "in": "path", "description": "Person id number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1020,15 +2072,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1042,21 +2107,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1064,15 +2137,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1086,21 +2172,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1137,14 +2231,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { @@ -1158,18 +2258,26 @@ } }, "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1186,21 +2294,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1228,13 +2344,19 @@ "description": "Not Found", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1251,14 +2373,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1268,19 +2396,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } } } @@ -1298,21 +2432,29 @@ "in": "path", "description": "Driver license number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1320,13 +2462,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } } } } @@ -1343,35 +2491,48 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "category", "in": "path", "description": "Category to check, optional, default B", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "drivinglicenseid", "in": "path", "description": "License id, optional, default persons newest license", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1379,13 +2540,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } } } } @@ -1402,28 +2569,38 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "categoryid", "in": "path", "description": "License category", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1460,28 +2637,38 @@ "in": "path", "description": "Social security number of applicant", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1490,13 +2677,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -1504,13 +2697,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -1527,28 +2726,38 @@ "in": "path", "description": "Person's social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1557,13 +2766,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -1571,13 +2786,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -1594,28 +2815,38 @@ "in": "path", "description": "", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model with information about the person", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostRenewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/PostRenewal65AndOver" + } } } }, @@ -1624,13 +2855,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } }, @@ -1638,13 +2875,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } } @@ -1661,28 +2904,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1728,28 +2985,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1795,28 +3066,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1862,28 +3147,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1929,28 +3228,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1996,28 +3309,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -2063,28 +3390,39 @@ "in": "path", "description": "Person's social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "licenseid", "in": "path", "description": "License id", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -2094,43 +3432,176 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/drivinglicense/v4/{SSN}/drivingschool3finished/{licenseId}": { + "post": { + "tags": ["Okuskirteini"], + "summary": "Update person license, has finished driving school 3", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "licenseId", + "in": "path", + "description": "Person license id", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "204": { + "description": "No Content" + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" } } } + } + } + } + } + }, + "components": { + "schemas": { + "ApplicationFinishedDto": { + "type": "object", + "properties": { + "licenseId": { + "type": "integer", + "description": "New license id", + "format": "int32", + "nullable": true + }, + "result": { + "type": "integer", + "description": "Result", + "format": "int32" + }, + "errorCode": { + "type": "string", + "description": "Error code if any", + "nullable": true + } + }, + "additionalProperties": false, + "description": "Dto for application finished" + }, + "ApplicationForCategoryDto": { + "type": "object", + "properties": { + "category": { + "type": "string", + "description": "Category applied for", + "nullable": true }, - "400": { - "description": "Bad Request", - "content": { - "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } - }, - "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } - }, - "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } - } - } + "result": { + "type": "boolean", + "description": "Can person apply for full license" + }, + "errorCode": { + "type": "string", + "description": "Error code if can not apply", + "nullable": true + }, + "customMessage": { + "type": "string", + "description": "Custom message", + "nullable": true } - } - } - } - }, - "components": { - "schemas": { + }, + "additionalProperties": false, + "description": "Data transfer object for category application" + }, "CategoryDto": { "type": "object", "properties": { @@ -2250,12 +3721,20 @@ "DriverLicenseDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, "temporaryLicense": { "type": "boolean", "description": "Is this license marked as temporary" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2294,13 +3773,17 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, @@ -2316,9 +3799,15 @@ "format": "int32", "nullable": true }, - "photo": { "$ref": "#/components/schemas/ImageDto" }, - "signature": { "$ref": "#/components/schemas/ImageDto" }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "photo": { + "$ref": "#/components/schemas/ImageDto" + }, + "signature": { + "$ref": "#/components/schemas/ImageDto" + }, + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -2326,8 +3815,16 @@ "DriverLicenseWithoutImagesDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2366,7 +3863,9 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, @@ -2377,11 +3876,15 @@ }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -2509,6 +4012,11 @@ "type": "string", "description": "Origin of creation", "nullable": true + }, + "districtId": { + "type": "integer", + "description": "District id", + "format": "int32" } }, "additionalProperties": false, @@ -2552,6 +4060,63 @@ "additionalProperties": false, "description": "Data transfer object for if person has finished driving school 3" }, + "HealthDeclarationModel": { + "type": "object", + "properties": { + "isDisabled": { + "type": "boolean", + "description": "Is person disabled", + "nullable": true + }, + "hasDiabetes": { + "type": "boolean", + "description": "Has person diabetes", + "nullable": true + }, + "hasEpilepsy": { + "type": "boolean", + "description": "Has person Epilepsy", + "nullable": true + }, + "isAlcoholic": { + "type": "boolean", + "description": "Is person alcoholic", + "nullable": true + }, + "hasHeartDisease": { + "type": "boolean", + "description": "Does person have a heart disease", + "nullable": true + }, + "hasMentalIllness": { + "type": "boolean", + "description": "Has person mental illness", + "nullable": true + }, + "hasOtherDiseases": { + "type": "boolean", + "description": "Has person other diseases", + "nullable": true + }, + "usesMedicalDrugs": { + "type": "boolean", + "description": "Does person use medical drugs", + "nullable": true + }, + "usesContactGlasses": { + "type": "boolean", + "description": "Does person use contact glasses", + "nullable": true + }, + "hasReducedPeripheralVision": { + "type": "boolean", + "description": "Does person have reduced peripheral vision", + "nullable": true + } + }, + "additionalProperties": false, + "description": "Health declaration when applying for driver's license" + }, "ImageDto": { "type": "object", "properties": { @@ -2595,6 +4160,53 @@ "additionalProperties": false, "description": "Entity for picture" }, + "ImageFromThjodskraDto": { + "type": "object", + "properties": { + "content": { + "type": "string", + "description": "Image content", + "nullable": true + }, + "contentLength": { + "type": "integer", + "description": "Content length", + "format": "int32" + }, + "contentDocumentType": { + "type": "string", + "description": "Content document type", + "nullable": true + }, + "created": { + "type": "string", + "description": "Created", + "format": "date-time" + }, + "biometricId": { + "type": "string", + "description": "BiometricId", + "nullable": true + } + }, + "additionalProperties": false, + "description": "Image with info from thjodskra" + }, + "ImagesFromThjodskraDto": { + "type": "object", + "properties": { + "images": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ImageFromThjodskraDto" + }, + "description": "Array of all images from thjodskra", + "nullable": true + } + }, + "additionalProperties": false, + "description": "All images from thjodskra dto" + }, "InstructorDto": { "type": "object", "properties": { @@ -2603,7 +4215,11 @@ "description": "Social security number", "nullable": true }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "driverLicenseId": { "type": "integer", "description": "Instructors license id", @@ -2818,6 +4434,38 @@ "additionalProperties": false, "description": "Data transfer object for penalty points" }, + "PostApplicationForBEModel": { + "type": "object", + "properties": { + "ssn": { + "type": "string", + "description": "Social security number", + "nullable": true + }, + "instructorSSN": { + "type": "string", + "description": "Driving instructor social security number", + "nullable": true + }, + "primaryPhoneNumber": { + "type": "string", + "description": "Primary phone number", + "nullable": true + }, + "studentEmail": { + "type": "string", + "description": "Student email", + "nullable": true + }, + "districtId": { + "type": "integer", + "description": "Ordering district", + "format": "int32" + } + }, + "additionalProperties": false, + "description": "Post application for BE category" + }, "PostNewCollaborative": { "type": "object", "properties": { @@ -2835,6 +4483,11 @@ "type": "string", "description": "User id", "nullable": true + }, + "licenseStolenOrLost": { + "type": "boolean", + "description": "Has last license been lost or stolen", + "nullable": true } }, "additionalProperties": false, @@ -2902,6 +4555,11 @@ "type": "string", "description": "Address to send license to", "nullable": true + }, + "healtCertificate": { + "type": "string", + "description": "Healt certificate", + "nullable": true } }, "additionalProperties": false, @@ -2948,6 +4606,11 @@ "description": "Person social security number", "format": "date-time", "nullable": true + }, + "healtCertificate": { + "type": "string", + "description": "Healt certificate", + "nullable": true } }, "additionalProperties": false, @@ -3050,6 +4713,71 @@ "additionalProperties": false, "description": "Post new temporary license" }, + "PostTemporaryLicenseWithHealthDeclaration": { + "required": [ + "authority", + "bringNewPhoto", + "bringsHealthCertificate", + "instructorSSN", + "sendLicenseInMail", + "ssn" + ], + "type": "object", + "properties": { + "ssn": { + "maxLength": 10, + "minLength": 0, + "pattern": "^[0-9]{1,10}$", + "type": "string", + "description": "Social security number" + }, + "authority": { + "type": "integer", + "description": "Publishing authority", + "format": "int32" + }, + "bringsHealthCertificate": { + "type": "boolean", + "description": "Does person need to present health certificate" + }, + "bringNewPhoto": { + "type": "boolean", + "description": "Applicant will bring new photo for license" + }, + "sendLicenseInMail": { + "type": "boolean", + "description": "Applicant has asked to send license in mail" + }, + "sendToAddress": { + "maxLength": 100, + "minLength": 0, + "type": "string", + "description": "Address to send license to", + "nullable": true + }, + "instructorSSN": { + "minLength": 1, + "type": "string", + "description": "Social security number for driving teachser" + }, + "email": { + "type": "string", + "description": "Applicant email", + "nullable": true + }, + "gsm": { + "pattern": "^[0-9]{1,10}$", + "type": "string", + "description": "Applicant mobile number", + "nullable": true + }, + "healthDeclaration": { + "$ref": "#/components/schemas/HealthDeclarationModel" + } + }, + "additionalProperties": false, + "description": "Post new temporary license" + }, "PracticePermitDto": { "type": "object", "properties": { @@ -3063,7 +4791,10 @@ "description": "The instructor", "nullable": true }, - "isOk": { "type": "boolean", "description": "Is the record OK" }, + "isOk": { + "type": "boolean", + "description": "Is the record OK" + }, "errorCode": { "type": "string", "description": "Error code, if any", @@ -3076,11 +4807,27 @@ "ProblemDetails": { "type": "object", "properties": { - "type": { "type": "string", "nullable": true }, - "title": { "type": "string", "nullable": true }, - "status": { "type": "integer", "format": "int32", "nullable": true }, - "detail": { "type": "string", "nullable": true }, - "instance": { "type": "string", "nullable": true } + "type": { + "type": "string", + "nullable": true + }, + "title": { + "type": "string", + "nullable": true + }, + "status": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "detail": { + "type": "string", + "nullable": true + }, + "instance": { + "type": "string", + "nullable": true + } }, "additionalProperties": false }, @@ -3109,8 +4856,16 @@ "TegSviptingaDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "heiti": { "type": "string", "description": "Name", "nullable": true } + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "heiti": { + "type": "string", + "description": "Name", + "nullable": true + } }, "additionalProperties": false, "description": "Dto for Tegund sviptinga" @@ -3186,6 +4941,11 @@ "type": "string", "description": "Origin of creation", "nullable": true + }, + "districtId": { + "type": "integer", + "description": "District id", + "format": "int32" } }, "additionalProperties": false, diff --git a/libs/clients/driving-license/src/v5/clientConfig.json b/libs/clients/driving-license/src/v5/clientConfig.json index 51844f36485a..eb4a547bab5f 100644 --- a/libs/clients/driving-license/src/v5/clientConfig.json +++ b/libs/clients/driving-license/src/v5/clientConfig.json @@ -3,7 +3,10 @@ "info": { "title": "RLS driver licence Rest API", "description": "RESTFul services for driver licences. Programmed in ASP.NET Core 3 API ", - "contact": { "name": "TMD", "email": "tmd@tmd.is" }, + "contact": { + "name": "TMD", + "email": "tmd@tmd.is" + }, "version": "5.0" }, "paths": { @@ -16,21 +19,29 @@ "name": "jwttoken", "in": "header", "description": "JWT token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -68,13 +79,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -91,21 +108,29 @@ "in": "path", "description": "RLS application id", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -133,13 +158,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -156,14 +187,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -173,19 +210,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } } } @@ -203,14 +246,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -220,19 +269,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } } } } @@ -250,14 +305,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -303,14 +364,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -320,19 +387,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } } } } @@ -349,21 +422,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -371,13 +452,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -393,21 +483,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -415,13 +513,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -437,21 +544,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -459,15 +574,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -480,21 +608,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -502,15 +638,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -524,21 +673,29 @@ "in": "path", "description": "Person social serial number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -575,21 +732,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -597,13 +762,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } } } }, @@ -611,13 +782,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -633,36 +810,52 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -679,27 +872,37 @@ "in": "path", "description": "Category to check for (B, C, and so on)", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -736,28 +939,38 @@ "in": "path", "description": "Category in license", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewFinalLicense" } + "schema": { + "$ref": "#/components/schemas/PostNewFinalLicense" + } } } }, @@ -766,13 +979,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -780,13 +1002,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -802,28 +1030,38 @@ "name": "jwttoken", "in": "header", "description": "JWT token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewCollaborative" } + "schema": { + "$ref": "#/components/schemas/PostNewCollaborative" + } } } }, @@ -832,13 +1070,22 @@ "description": "Created", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -846,13 +1093,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -868,21 +1121,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -890,13 +1151,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } } } } @@ -913,21 +1180,29 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostTemporaryLicense" } + "schema": { + "$ref": "#/components/schemas/PostTemporaryLicense" + } } } }, @@ -984,21 +1259,29 @@ "name": "jwttoken", "in": "header", "description": "JWT token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -1066,14 +1349,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -1139,21 +1428,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1161,13 +1458,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } } } } @@ -1182,21 +1485,29 @@ { "name": "jwttoken", "in": "header", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1233,13 +1544,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1255,21 +1572,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1277,13 +1602,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -1300,21 +1634,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1350,21 +1692,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1372,13 +1722,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -1394,21 +1753,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1416,13 +1783,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -1438,21 +1814,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1460,15 +1844,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1481,21 +1878,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1503,15 +1908,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1523,21 +1941,29 @@ { "name": "jwttoken", "in": "header", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1574,14 +2000,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -1595,18 +2027,26 @@ } }, "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1620,21 +2060,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1662,13 +2110,19 @@ "description": "Not Found", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1685,14 +2139,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1702,19 +2162,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } } } @@ -1733,21 +2199,29 @@ "in": "path", "description": "Driver license number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1755,13 +2229,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } } } } @@ -1778,34 +2258,47 @@ "in": "path", "description": "Category to check, optional, default B", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "drivinglicenseid", "in": "path", "description": "License id, optional, default persons newest license", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1813,13 +2306,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } } } } @@ -1836,27 +2335,37 @@ "in": "path", "description": "License category", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1892,28 +2401,38 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1922,13 +2441,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -1936,13 +2461,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -1958,28 +2489,38 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1988,13 +2529,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -2002,13 +2549,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -2024,28 +2577,38 @@ "name": "jwttoken", "in": "header", "description": "Token with person social security number", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model with information about the person", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostRenewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/PostRenewal65AndOver" + } } } }, @@ -2054,13 +2617,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } }, @@ -2068,13 +2637,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } } @@ -2091,28 +2666,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2158,28 +2747,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2225,28 +2828,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2292,28 +2909,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2359,28 +2990,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2426,28 +3071,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2492,28 +3151,39 @@ "name": "jwttoken", "in": "header", "description": "jwt token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "licenseid", "in": "path", "description": "License id", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2523,19 +3193,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } } } @@ -2544,13 +3220,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -2728,12 +3410,20 @@ "DriverLicenseDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, "temporaryLicense": { "type": "boolean", "description": "Is this license marked as temporary" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2772,13 +3462,17 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, @@ -2794,9 +3488,15 @@ "format": "int32", "nullable": true }, - "photo": { "$ref": "#/components/schemas/ImageDto" }, - "signature": { "$ref": "#/components/schemas/ImageDto" }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "photo": { + "$ref": "#/components/schemas/ImageDto" + }, + "signature": { + "$ref": "#/components/schemas/ImageDto" + }, + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -2804,8 +3504,16 @@ "DriverLicenseWithoutImagesDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2844,7 +3552,9 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, @@ -2855,11 +3565,15 @@ }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -3172,7 +3886,9 @@ "properties": { "images": { "type": "array", - "items": { "$ref": "#/components/schemas/ImageFromThjodskraDto" }, + "items": { + "$ref": "#/components/schemas/ImageFromThjodskraDto" + }, "description": "Array of all images from thjodskra", "nullable": true } @@ -3188,7 +3904,11 @@ "description": "Public identity number", "nullable": true }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "driverLicenseId": { "type": "integer", "description": "Númer ökuskírteinis ökukennara", @@ -3747,7 +4467,10 @@ "description": "The instructor", "nullable": true }, - "isOk": { "type": "boolean", "description": "Is the record OK" }, + "isOk": { + "type": "boolean", + "description": "Is the record OK" + }, "errorCode": { "type": "string", "description": "Error code, if any", @@ -3760,11 +4483,27 @@ "ProblemDetails": { "type": "object", "properties": { - "type": { "type": "string", "nullable": true }, - "title": { "type": "string", "nullable": true }, - "status": { "type": "integer", "format": "int32", "nullable": true }, - "detail": { "type": "string", "nullable": true }, - "instance": { "type": "string", "nullable": true } + "type": { + "type": "string", + "nullable": true + }, + "title": { + "type": "string", + "nullable": true + }, + "status": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "detail": { + "type": "string", + "nullable": true + }, + "instance": { + "type": "string", + "nullable": true + } }, "additionalProperties": false }, @@ -3793,8 +4532,16 @@ "TegSviptingaDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "heiti": { "type": "string", "description": "Name", "nullable": true } + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "heiti": { + "type": "string", + "description": "Name", + "nullable": true + } }, "additionalProperties": false, "description": "Dto for Tegund sviptinga" diff --git a/libs/clients/signature-collection/src/clientConfig.json b/libs/clients/signature-collection/src/clientConfig.json index 4e173c00e915..d7f0d3e9372d 100644 --- a/libs/clients/signature-collection/src/clientConfig.json +++ b/libs/clients/signature-collection/src/clientConfig.json @@ -2,6 +2,145 @@ "openapi": "3.0.1", "info": { "title": "MedmaeliRestAPI", "version": "1.0" }, "paths": { + "/Admin/Frambod": { + "post": { + "tags": ["Admin"], + "requestBody": { + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/FrambodRequestDTO" } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/FrambodDTO" } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Admin/Frambod/{ID}": { + "delete": { + "tags": ["Admin"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + } + ], + "responses": { + "200": { "description": "OK" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Admin/Medmaeli/{ID}": { + "delete": { + "tags": ["Admin"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + } + ], + "responses": { + "200": { "description": "OK" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Admin/Medmaelasofnun/{ID}/EinsInfo/{Kennitala}": { + "get": { + "tags": ["Admin"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + }, + { + "name": "Kennitala", + "in": "path", + "required": true, + "schema": { "type": "string" } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/EinstaklingurKosningInfoDTO" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Admin/Medmaelasofnun/{ID}/ToggleSofnun": { + "post": { + "tags": ["Admin"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" } + } + } + }, + "204": { "description": "No Content" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, "/Frambod": { "get": { "tags": ["Frambod"], @@ -9,13 +148,12 @@ { "name": "sofnunID", "in": "query", - "style": "form", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -32,6 +170,32 @@ } } } + }, + "post": { + "tags": ["Frambod"], + "requestBody": { + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/FrambodRequestDTO" } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/FrambodDTO" } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } } }, "/Frambod/{ID}": { @@ -42,13 +206,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodDTO" } @@ -62,6 +225,26 @@ } } } + }, + "delete": { + "tags": ["Frambod"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + } + ], + "responses": { + "200": { "description": "OK" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } } }, "/Frambod/{ID}/Medmaelalistar": { @@ -72,13 +255,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -105,13 +287,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodBaseDTO" } @@ -135,13 +316,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodBaseDTO" } @@ -165,7 +345,6 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -178,7 +357,7 @@ }, "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodDTO" } @@ -202,20 +381,18 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "Kennitala", "in": "path", "required": true, - "style": "simple", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/UmbodBaseDTO" } @@ -236,7 +413,7 @@ "tags": ["Kosning"], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -263,13 +440,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/KosningDTO" } @@ -294,13 +470,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -327,25 +502,22 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "startDate", "in": "query", - "style": "form", "schema": { "type": "string", "format": "date-time" } }, { "name": "endDate", "in": "query", - "style": "form", "schema": { "type": "string", "format": "date-time" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" } @@ -368,25 +540,22 @@ { "name": "frambodID", "in": "query", - "style": "form", "schema": { "type": "integer", "format": "int32" } }, { "name": "sofnunID", "in": "query", - "style": "form", "schema": { "type": "integer", "format": "int32" } }, { "name": "svaediID", "in": "query", - "style": "form", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -403,6 +572,34 @@ } } } + }, + "post": { + "tags": ["Medmaelalistar"], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/MedmaelalistarRequestDTO" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } } }, "/Medmaelalistar/AddListar": { @@ -419,7 +616,7 @@ }, "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -452,7 +649,7 @@ }, "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -479,13 +676,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } @@ -500,6 +696,54 @@ } } } + }, + "post": { + "tags": ["Medmaelalistar"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + }, + { "name": "kennitala", "in": "query", "schema": { "type": "string" } } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + }, + "delete": { + "tags": ["Medmaelalistar"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + } + ], + "responses": { + "200": { "description": "OK" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } } }, "/Medmaelalistar/{ID}/Medmaeli": { @@ -510,13 +754,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -544,19 +787,13 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } }, - { - "name": "kennitala", - "in": "query", - "style": "form", - "schema": { "type": "string" } - } + { "name": "kennitala", "in": "query", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } @@ -580,7 +817,6 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -595,7 +831,7 @@ }, "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -613,19 +849,6 @@ } } }, - "/Medmaelalistar/Token": { - "get": { - "tags": ["Medmaelalistar"], - "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, "/Medmaelalistar/{ID}/ExtendTime": { "patch": { "tags": ["Medmaelalistar"], @@ -634,19 +857,17 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "newEndDate", "in": "query", - "style": "form", "schema": { "type": "string", "format": "date-time" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } @@ -671,13 +892,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } @@ -702,7 +922,6 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -715,7 +934,7 @@ }, "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -743,13 +962,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -774,13 +992,12 @@ { "name": "includeInactive", "in": "query", - "style": "form", "schema": { "type": "boolean", "default": false } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -809,13 +1026,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -842,13 +1058,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -876,13 +1091,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -910,20 +1124,18 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "Kennitala", "in": "path", "required": true, - "style": "simple", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -949,20 +1161,18 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "Kennitala", "in": "path", "required": true, - "style": "simple", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -988,13 +1198,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" } @@ -1019,7 +1228,6 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -1032,7 +1240,7 @@ }, "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -1060,19 +1268,17 @@ "name": "Kennitala", "in": "path", "required": true, - "style": "simple", "schema": { "type": "string" } }, { "name": "sofnunID", "in": "query", - "style": "form", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -1099,13 +1305,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } @@ -1129,13 +1334,12 @@ "name": "ID", "in": "path", "required": true, - "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } @@ -1150,11 +1354,113 @@ } } } + }, + "/Medmaeli/{ID}": { + "delete": { + "tags": ["Medmaeli"], + "parameters": [ + { + "name": "ID", + "in": "path", + "required": true, + "schema": { "type": "integer", "format": "int32" } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Tegund/Kosning": { + "get": { + "tags": ["Tegund"], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { "$ref": "#/components/schemas/TegundDTO" } + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Tegund/Medmaeli": { + "get": { + "tags": ["Tegund"], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { "$ref": "#/components/schemas/TegundDTO" } + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, + "/Tegund/Umbod": { + "get": { + "tags": ["Tegund"], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { "$ref": "#/components/schemas/TegundDTO" } + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } } }, "components": { "schemas": { "EinstaklingurKosningInfoDTO": { + "required": ["kennitala", "kosningNafn", "nafn"], "type": "object", "properties": { "kennitala": { "type": "string" }, @@ -1182,29 +1488,38 @@ "additionalProperties": false }, "EinstaklingurMaFrambodInfo": { + "required": ["kennitala"], "type": "object", "properties": { + "kennitala": { "type": "string" }, + "medListabokstaf": { "type": "boolean" }, "aldur": { "type": "boolean" }, - "rikisfang": { "type": "boolean" } + "rikisfang": { "type": "boolean" }, + "maFrambod": { "type": "boolean", "readOnly": true } }, "additionalProperties": false }, "EinstaklingurMaKjosaInfo": { + "required": ["kennitala"], "type": "object", "properties": { "kennitala": { "type": "string" }, + "erEinstaklingur": { "type": "boolean" }, "aldur": { "type": "boolean" }, "rikisfang": { "type": "boolean" }, - "buseta": { "type": "boolean" } + "buseta": { "type": "boolean" }, + "maKjosa": { "type": "boolean", "readOnly": true } }, "additionalProperties": false }, "FrambodBaseDTO": { + "required": ["kennitala", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, "nafn": { "type": "string" }, "kennitala": { "type": "string" }, + "listabokstafur": { "type": "string", "nullable": true }, "simi": { "type": "string", "nullable": true }, "netfang": { "type": "string", "nullable": true }, "medmaelasofnunID": { "type": "integer", "format": "int32" } @@ -1212,11 +1527,13 @@ "additionalProperties": false }, "FrambodDTO": { + "required": ["kennitala", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, "nafn": { "type": "string" }, "kennitala": { "type": "string" }, + "listabokstafur": { "type": "string", "nullable": true }, "simi": { "type": "string", "nullable": true }, "netfang": { "type": "string", "nullable": true }, "medmaelasofnunID": { "type": "integer", "format": "int32" }, @@ -1230,7 +1547,50 @@ }, "additionalProperties": false }, + "FrambodListarRequestDTO": { + "type": "object", + "properties": { + "svaediID": { "type": "integer", "format": "int32" }, + "listiNafn": { "type": "string" } + }, + "additionalProperties": false + }, + "FrambodRequestDTO": { + "required": ["kennitala"], + "type": "object", + "properties": { + "sofnunID": { "type": "integer", "format": "int32" }, + "kennitala": { "type": "string" }, + "simi": { "type": "string" }, + "netfang": { "type": "string" }, + "medmaelalistar": { + "type": "array", + "items": { "$ref": "#/components/schemas/FrambodListarRequestDTO" } + }, + "umbodsadilar": { + "type": "array", + "items": { "$ref": "#/components/schemas/FrambodUmbodRequestDTO" } + } + }, + "additionalProperties": false + }, + "FrambodUmbodRequestDTO": { + "required": ["kennitala", "tegundUmbodsID"], + "type": "object", + "properties": { + "kennitala": { "type": "string" }, + "simi": { "type": "string" }, + "netfang": { "type": "string" }, + "tegundUmbodsID": { "type": "integer", "format": "int32" }, + "svaediIDList": { + "type": "array", + "items": { "type": "integer", "format": "int32" } + } + }, + "additionalProperties": false + }, "KosningBaseDTO": { + "required": ["kosningTegund", "kosningTegundNr", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1252,6 +1612,7 @@ "additionalProperties": false }, "KosningDTO": { + "required": ["kosningTegund", "kosningTegundNr", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1275,7 +1636,18 @@ }, "additionalProperties": false }, + "MedmaelalistarRequestDTO": { + "type": "object", + "properties": { + "frambodID": { "type": "integer", "format": "int32" }, + "medmaelalisti": { + "$ref": "#/components/schemas/FrambodListarRequestDTO" + } + }, + "additionalProperties": false + }, "MedmaelalistiBaseDTO": { + "required": ["frambodNafn", "listiNafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1291,6 +1663,7 @@ "additionalProperties": false }, "MedmaelalistiDTO": { + "required": ["frambodNafn", "listiNafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1319,22 +1692,13 @@ "netfang": { "type": "string" }, "medmaelalistar": { "type": "array", - "items": { - "$ref": "#/components/schemas/MedmaelalistiSvaediRequestDTO" - } + "items": { "$ref": "#/components/schemas/FrambodListarRequestDTO" } } }, "additionalProperties": false }, - "MedmaelalistiSvaediRequestDTO": { - "type": "object", - "properties": { - "svaediID": { "type": "integer", "format": "int32" }, - "listiNafn": { "type": "string" } - }, - "additionalProperties": false - }, "MedmaelasofnunBaseDTO": { + "required": ["kosningNafn", "kosningTegund"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1349,6 +1713,7 @@ "additionalProperties": false }, "MedmaelasofnunDTO": { + "required": ["kosningNafn", "kosningTegund"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1366,6 +1731,7 @@ "additionalProperties": false }, "MedmaelasofnunExtendedDTO": { + "required": ["kosningNafn", "kosningTegund"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1391,6 +1757,7 @@ "additionalProperties": false }, "MedmaeliBaseDTO": { + "required": ["kennitala"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1406,6 +1773,7 @@ "additionalProperties": false }, "MedmaeliBulkItemDTO": { + "required": ["kennitala"], "type": "object", "properties": { "kennitala": { "type": "string" }, @@ -1448,6 +1816,7 @@ "additionalProperties": false }, "MedmaeliDTO": { + "required": ["kennitala"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1464,6 +1833,7 @@ "additionalProperties": false }, "SvaediDTO": { + "required": ["nafn", "svaediTegundLysing"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1475,15 +1845,31 @@ }, "additionalProperties": false }, + "TegundDTO": { + "type": "object", + "properties": { + "id": { "type": "integer", "format": "int32" }, + "nr": { "type": "integer", "format": "int32" }, + "lysing": { "type": "string", "nullable": true } + }, + "additionalProperties": false + }, "UmbodBaseDTO": { + "required": ["kennitala"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, - "nafn": { "type": "string" }, + "nafn": { "type": "string", "nullable": true }, "kennitala": { "type": "string" }, "simi": { "type": "string", "nullable": true }, "netfang": { "type": "string", "nullable": true }, - "frambodID": { "type": "integer", "format": "int32" } + "svaediID": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "frambodID": { "type": "integer", "format": "int32" }, + "tegundUmbods": { "$ref": "#/components/schemas/TegundDTO" } }, "additionalProperties": false } From 08f2ed482696be8695a9a1419c2ac080be8963f5 Mon Sep 17 00:00:00 2001 From: kksteini Date: Wed, 3 Jul 2024 14:10:00 +0000 Subject: [PATCH 2/6] Cleanup --- .../src/lib/drivingLicense.service.ts | 25 ++++++++++++------- .../driving-license-duplicate.service.ts | 1 + .../sectionDataProviders.ts | 10 ++++---- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts index 19b68dae4bff..b282ef8f5e17 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts @@ -400,25 +400,32 @@ export class DrivingLicenseService { 'Tákntala 400 fannst á ökuskírteini. Vinsamlegast hafðu samband við Sýslumann', } } - console.log( - '🚀 ~ DrivingLicenseService ~ canGetNewDuplicate ~ license:', - license, - ) const in_six_months = new Date( new Date(Date.now()).setMonth(new Date().getMonth() + 6), ) - license.categories?.forEach((category) => { - if (category.expires === null || category.expires < in_six_months) { + for (const category of license.categories) { + if (category.expires === null) { return { canGetNewDuplicate: false, summary: - 'Ökuskírteini útrunnið eða rennur út eftir 6 mánuði fyrir ' + - category.name, + 'Ökuskírteini vantar skráningu fyrir því hvenær það rennur út fyrir: ' + + category.name + + '. Vinsamlegast hafðu samband við Sýslumann', } } - }) + + if (category.expires < in_six_months) { + return { + canGetNewDuplicate: false, + summary: + 'Ökuskírteini útrunnið eða rennur út á næstu 6 mánuðum fyrir: ' + + category.name + + '. Vinsamlegast hafðu samband við Sýslumann', + } + } + } return { canGetNewDuplicate: true, diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts index 27ff12300da4..fb380f5b3382 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts @@ -24,6 +24,7 @@ export class DrivingLicenseDuplicateService extends BaseTemplateApiService { const can = await this.drivingLicenseService.canGetNewDuplicate({ token: auth.authorization, }) + console.log(JSON.stringify(can)) if (!can.canGetNewDuplicate) { throw new TemplateApiError( { diff --git a/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts b/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts index b8e44e5cd023..cf8ca65b1327 100644 --- a/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts +++ b/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts @@ -38,6 +38,11 @@ export const sectionDataProviders = buildExternalDataProvider({ title: '', subTitle: '', }), + buildDataProviderItem({ + provider: DuplicateEligibilityApi, + title: '', + subTitle: '', + }), buildDataProviderItem({ provider: UserProfileApi, title: m.dataCollectionUserProfileTitle, @@ -53,11 +58,6 @@ export const sectionDataProviders = buildExternalDataProvider({ title: '', subTitle: '', }), - buildDataProviderItem({ - provider: DuplicateEligibilityApi, - title: '', - subTitle: '', - }), buildDataProviderItem({ provider: SyslumadurPaymentCatalogApi, title: '', From 337edae73e20d73d2966d1fbdc4d284e272efcfd Mon Sep 17 00:00:00 2001 From: kksteini Date: Wed, 3 Jul 2024 14:14:05 +0000 Subject: [PATCH 3/6] Fix case --- .../domains/driving-license/src/lib/drivingLicense.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts index b282ef8f5e17..625193008d30 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts @@ -401,7 +401,7 @@ export class DrivingLicenseService { } } - const in_six_months = new Date( + const inSixMonths = new Date( new Date(Date.now()).setMonth(new Date().getMonth() + 6), ) @@ -416,7 +416,7 @@ export class DrivingLicenseService { } } - if (category.expires < in_six_months) { + if (category.expires < inSixMonths) { return { canGetNewDuplicate: false, summary: From 4e24e04c7c0b0ec0247adf0361c1bdb33a67a44d Mon Sep 17 00:00:00 2001 From: kksteini Date: Wed, 3 Jul 2024 14:16:19 +0000 Subject: [PATCH 4/6] Cleanup --- .../driving-license-duplicate.service.ts | 1 - .../src/clientConfig.json | 598 ++++-------------- 2 files changed, 106 insertions(+), 493 deletions(-) diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts index fb380f5b3382..27ff12300da4 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts @@ -24,7 +24,6 @@ export class DrivingLicenseDuplicateService extends BaseTemplateApiService { const can = await this.drivingLicenseService.canGetNewDuplicate({ token: auth.authorization, }) - console.log(JSON.stringify(can)) if (!can.canGetNewDuplicate) { throw new TemplateApiError( { diff --git a/libs/clients/signature-collection/src/clientConfig.json b/libs/clients/signature-collection/src/clientConfig.json index d7f0d3e9372d..4e173c00e915 100644 --- a/libs/clients/signature-collection/src/clientConfig.json +++ b/libs/clients/signature-collection/src/clientConfig.json @@ -2,145 +2,6 @@ "openapi": "3.0.1", "info": { "title": "MedmaeliRestAPI", "version": "1.0" }, "paths": { - "/Admin/Frambod": { - "post": { - "tags": ["Admin"], - "requestBody": { - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/FrambodRequestDTO" } - } - } - }, - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/FrambodDTO" } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Admin/Frambod/{ID}": { - "delete": { - "tags": ["Admin"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - } - ], - "responses": { - "200": { "description": "OK" }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Admin/Medmaeli/{ID}": { - "delete": { - "tags": ["Admin"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - } - ], - "responses": { - "200": { "description": "OK" }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Admin/Medmaelasofnun/{ID}/EinsInfo/{Kennitala}": { - "get": { - "tags": ["Admin"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - }, - { - "name": "Kennitala", - "in": "path", - "required": true, - "schema": { "type": "string" } - } - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/EinstaklingurKosningInfoDTO" - } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Admin/Medmaelasofnun/{ID}/ToggleSofnun": { - "post": { - "tags": ["Admin"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - } - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" } - } - } - }, - "204": { "description": "No Content" }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, "/Frambod": { "get": { "tags": ["Frambod"], @@ -148,12 +9,13 @@ { "name": "sofnunID", "in": "query", + "style": "form", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -170,32 +32,6 @@ } } } - }, - "post": { - "tags": ["Frambod"], - "requestBody": { - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/FrambodRequestDTO" } - } - } - }, - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/FrambodDTO" } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } } }, "/Frambod/{ID}": { @@ -206,12 +42,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodDTO" } @@ -225,26 +62,6 @@ } } } - }, - "delete": { - "tags": ["Frambod"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - } - ], - "responses": { - "200": { "description": "OK" }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } } }, "/Frambod/{ID}/Medmaelalistar": { @@ -255,12 +72,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -287,12 +105,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodBaseDTO" } @@ -316,12 +135,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodBaseDTO" } @@ -345,6 +165,7 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -357,7 +178,7 @@ }, "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/FrambodDTO" } @@ -381,18 +202,20 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "Kennitala", "in": "path", "required": true, + "style": "simple", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/UmbodBaseDTO" } @@ -413,7 +236,7 @@ "tags": ["Kosning"], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -440,12 +263,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/KosningDTO" } @@ -470,12 +294,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -502,22 +327,25 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "startDate", "in": "query", + "style": "form", "schema": { "type": "string", "format": "date-time" } }, { "name": "endDate", "in": "query", + "style": "form", "schema": { "type": "string", "format": "date-time" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" } @@ -540,22 +368,25 @@ { "name": "frambodID", "in": "query", + "style": "form", "schema": { "type": "integer", "format": "int32" } }, { "name": "sofnunID", "in": "query", + "style": "form", "schema": { "type": "integer", "format": "int32" } }, { "name": "svaediID", "in": "query", + "style": "form", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -572,34 +403,6 @@ } } } - }, - "post": { - "tags": ["Medmaelalistar"], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MedmaelalistarRequestDTO" - } - } - } - }, - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } } }, "/Medmaelalistar/AddListar": { @@ -616,7 +419,7 @@ }, "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -649,7 +452,7 @@ }, "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -676,12 +479,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } @@ -696,54 +500,6 @@ } } } - }, - "post": { - "tags": ["Medmaelalistar"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - }, - { "name": "kennitala", "in": "query", "schema": { "type": "string" } } - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - }, - "delete": { - "tags": ["Medmaelalistar"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - } - ], - "responses": { - "200": { "description": "OK" }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } } }, "/Medmaelalistar/{ID}/Medmaeli": { @@ -754,12 +510,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -787,13 +544,19 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } }, - { "name": "kennitala", "in": "query", "schema": { "type": "string" } } + { + "name": "kennitala", + "in": "query", + "style": "form", + "schema": { "type": "string" } + } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } @@ -817,6 +580,7 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -831,7 +595,7 @@ }, "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -849,6 +613,19 @@ } } }, + "/Medmaelalistar/Token": { + "get": { + "tags": ["Medmaelalistar"], + "responses": { + "200": { + "description": "Success", + "content": { + "application/json": { "schema": { "type": "string" } } + } + } + } + } + }, "/Medmaelalistar/{ID}/ExtendTime": { "patch": { "tags": ["Medmaelalistar"], @@ -857,17 +634,19 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "newEndDate", "in": "query", + "style": "form", "schema": { "type": "string", "format": "date-time" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } @@ -892,12 +671,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" } @@ -922,6 +702,7 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -934,7 +715,7 @@ }, "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -962,12 +743,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -992,12 +774,13 @@ { "name": "includeInactive", "in": "query", + "style": "form", "schema": { "type": "boolean", "default": false } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1026,12 +809,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1058,12 +842,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1091,12 +876,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1124,18 +910,20 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "Kennitala", "in": "path", "required": true, + "style": "simple", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1161,18 +949,20 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } }, { "name": "Kennitala", "in": "path", "required": true, + "style": "simple", "schema": { "type": "string" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1198,12 +988,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" } @@ -1228,6 +1019,7 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], @@ -1240,7 +1032,7 @@ }, "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1268,17 +1060,19 @@ "name": "Kennitala", "in": "path", "required": true, + "style": "simple", "schema": { "type": "string" } }, { "name": "sofnunID", "in": "query", + "style": "form", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { @@ -1305,12 +1099,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } @@ -1334,12 +1129,13 @@ "name": "ID", "in": "path", "required": true, + "style": "simple", "schema": { "type": "integer", "format": "int32" } } ], "responses": { "200": { - "description": "OK", + "description": "Success", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } @@ -1354,113 +1150,11 @@ } } } - }, - "/Medmaeli/{ID}": { - "delete": { - "tags": ["Medmaeli"], - "parameters": [ - { - "name": "ID", - "in": "path", - "required": true, - "schema": { "type": "integer", "format": "int32" } - } - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Tegund/Kosning": { - "get": { - "tags": ["Tegund"], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundDTO" } - } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Tegund/Medmaeli": { - "get": { - "tags": ["Tegund"], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundDTO" } - } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } - }, - "/Tegund/Umbod": { - "get": { - "tags": ["Tegund"], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundDTO" } - } - } - } - }, - "400": { - "description": "Bad Request", - "content": { - "application/json": { "schema": { "type": "string" } } - } - } - } - } } }, "components": { "schemas": { "EinstaklingurKosningInfoDTO": { - "required": ["kennitala", "kosningNafn", "nafn"], "type": "object", "properties": { "kennitala": { "type": "string" }, @@ -1488,38 +1182,29 @@ "additionalProperties": false }, "EinstaklingurMaFrambodInfo": { - "required": ["kennitala"], "type": "object", "properties": { - "kennitala": { "type": "string" }, - "medListabokstaf": { "type": "boolean" }, "aldur": { "type": "boolean" }, - "rikisfang": { "type": "boolean" }, - "maFrambod": { "type": "boolean", "readOnly": true } + "rikisfang": { "type": "boolean" } }, "additionalProperties": false }, "EinstaklingurMaKjosaInfo": { - "required": ["kennitala"], "type": "object", "properties": { "kennitala": { "type": "string" }, - "erEinstaklingur": { "type": "boolean" }, "aldur": { "type": "boolean" }, "rikisfang": { "type": "boolean" }, - "buseta": { "type": "boolean" }, - "maKjosa": { "type": "boolean", "readOnly": true } + "buseta": { "type": "boolean" } }, "additionalProperties": false }, "FrambodBaseDTO": { - "required": ["kennitala", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, "nafn": { "type": "string" }, "kennitala": { "type": "string" }, - "listabokstafur": { "type": "string", "nullable": true }, "simi": { "type": "string", "nullable": true }, "netfang": { "type": "string", "nullable": true }, "medmaelasofnunID": { "type": "integer", "format": "int32" } @@ -1527,13 +1212,11 @@ "additionalProperties": false }, "FrambodDTO": { - "required": ["kennitala", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, "nafn": { "type": "string" }, "kennitala": { "type": "string" }, - "listabokstafur": { "type": "string", "nullable": true }, "simi": { "type": "string", "nullable": true }, "netfang": { "type": "string", "nullable": true }, "medmaelasofnunID": { "type": "integer", "format": "int32" }, @@ -1547,50 +1230,7 @@ }, "additionalProperties": false }, - "FrambodListarRequestDTO": { - "type": "object", - "properties": { - "svaediID": { "type": "integer", "format": "int32" }, - "listiNafn": { "type": "string" } - }, - "additionalProperties": false - }, - "FrambodRequestDTO": { - "required": ["kennitala"], - "type": "object", - "properties": { - "sofnunID": { "type": "integer", "format": "int32" }, - "kennitala": { "type": "string" }, - "simi": { "type": "string" }, - "netfang": { "type": "string" }, - "medmaelalistar": { - "type": "array", - "items": { "$ref": "#/components/schemas/FrambodListarRequestDTO" } - }, - "umbodsadilar": { - "type": "array", - "items": { "$ref": "#/components/schemas/FrambodUmbodRequestDTO" } - } - }, - "additionalProperties": false - }, - "FrambodUmbodRequestDTO": { - "required": ["kennitala", "tegundUmbodsID"], - "type": "object", - "properties": { - "kennitala": { "type": "string" }, - "simi": { "type": "string" }, - "netfang": { "type": "string" }, - "tegundUmbodsID": { "type": "integer", "format": "int32" }, - "svaediIDList": { - "type": "array", - "items": { "type": "integer", "format": "int32" } - } - }, - "additionalProperties": false - }, "KosningBaseDTO": { - "required": ["kosningTegund", "kosningTegundNr", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1612,7 +1252,6 @@ "additionalProperties": false }, "KosningDTO": { - "required": ["kosningTegund", "kosningTegundNr", "nafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1636,18 +1275,7 @@ }, "additionalProperties": false }, - "MedmaelalistarRequestDTO": { - "type": "object", - "properties": { - "frambodID": { "type": "integer", "format": "int32" }, - "medmaelalisti": { - "$ref": "#/components/schemas/FrambodListarRequestDTO" - } - }, - "additionalProperties": false - }, "MedmaelalistiBaseDTO": { - "required": ["frambodNafn", "listiNafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1663,7 +1291,6 @@ "additionalProperties": false }, "MedmaelalistiDTO": { - "required": ["frambodNafn", "listiNafn"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1692,13 +1319,22 @@ "netfang": { "type": "string" }, "medmaelalistar": { "type": "array", - "items": { "$ref": "#/components/schemas/FrambodListarRequestDTO" } + "items": { + "$ref": "#/components/schemas/MedmaelalistiSvaediRequestDTO" + } } }, "additionalProperties": false }, + "MedmaelalistiSvaediRequestDTO": { + "type": "object", + "properties": { + "svaediID": { "type": "integer", "format": "int32" }, + "listiNafn": { "type": "string" } + }, + "additionalProperties": false + }, "MedmaelasofnunBaseDTO": { - "required": ["kosningNafn", "kosningTegund"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1713,7 +1349,6 @@ "additionalProperties": false }, "MedmaelasofnunDTO": { - "required": ["kosningNafn", "kosningTegund"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1731,7 +1366,6 @@ "additionalProperties": false }, "MedmaelasofnunExtendedDTO": { - "required": ["kosningNafn", "kosningTegund"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1757,7 +1391,6 @@ "additionalProperties": false }, "MedmaeliBaseDTO": { - "required": ["kennitala"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1773,7 +1406,6 @@ "additionalProperties": false }, "MedmaeliBulkItemDTO": { - "required": ["kennitala"], "type": "object", "properties": { "kennitala": { "type": "string" }, @@ -1816,7 +1448,6 @@ "additionalProperties": false }, "MedmaeliDTO": { - "required": ["kennitala"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1833,7 +1464,6 @@ "additionalProperties": false }, "SvaediDTO": { - "required": ["nafn", "svaediTegundLysing"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, @@ -1845,31 +1475,15 @@ }, "additionalProperties": false }, - "TegundDTO": { - "type": "object", - "properties": { - "id": { "type": "integer", "format": "int32" }, - "nr": { "type": "integer", "format": "int32" }, - "lysing": { "type": "string", "nullable": true } - }, - "additionalProperties": false - }, "UmbodBaseDTO": { - "required": ["kennitala"], "type": "object", "properties": { "id": { "type": "integer", "format": "int32" }, - "nafn": { "type": "string", "nullable": true }, + "nafn": { "type": "string" }, "kennitala": { "type": "string" }, "simi": { "type": "string", "nullable": true }, "netfang": { "type": "string", "nullable": true }, - "svaediID": { - "type": "integer", - "format": "int32", - "nullable": true - }, - "frambodID": { "type": "integer", "format": "int32" }, - "tegundUmbods": { "$ref": "#/components/schemas/TegundDTO" } + "frambodID": { "type": "integer", "format": "int32" } }, "additionalProperties": false } From 41734806c0af401c6bc5fa0e4642d1bf7887f6e5 Mon Sep 17 00:00:00 2001 From: kksteini Date: Thu, 4 Jul 2024 09:17:52 +0000 Subject: [PATCH 5/6] Responding to PR comments --- .../src/lib/drivingLicense.service.ts | 36 +++++++++---------- .../src/lib/drivingLicense.type.ts | 2 +- libs/application/core/src/lib/messages.ts | 17 +++++++++ .../driving-license-duplicate.service.ts | 23 +++++++++--- 4 files changed, 53 insertions(+), 25 deletions(-) diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts index 625193008d30..26a3a1af72e1 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts @@ -45,6 +45,7 @@ import { import { info } from 'kennitala' import { computeCountryResidence } from '@island.is/residence-history' import { Jurisdiction } from './graphql/models' +import addMonths from 'date-fns/addMonths' const LOGTAG = '[api-domains-driving-license]' @@ -385,10 +386,9 @@ export class DrivingLicenseService { }) } - async canGetNewDuplicate(params: { - token: string - }): Promise { - const { token } = params + async canGetNewDuplicate( + token: string, + ): Promise { const license = await this.drivingLicenseApi.getCurrentLicense({ token, }) @@ -396,40 +396,38 @@ export class DrivingLicenseService { if (license.comments?.some((comment) => comment?.nr == '400')) { return { canGetNewDuplicate: false, - summary: - 'Tákntala 400 fannst á ökuskírteini. Vinsamlegast hafðu samband við Sýslumann', + meta: '', } } - const inSixMonths = new Date( - new Date(Date.now()).setMonth(new Date().getMonth() + 6), - ) + const inSixMonths = addMonths(new Date(), 6) - for (const category of license.categories) { + for (const category of license.categories ?? []) { if (category.expires === null) { + // Technically this will result in the wrong error message + // towards the user, however, contacting the registry + // with the category information should result in the error + // being discovered anyway. We log it here for good measure though. + this.logger.warn(`${LOGTAG} Category has no expiration date`, { + category: category.name, + }) return { canGetNewDuplicate: false, - summary: - 'Ökuskírteini vantar skráningu fyrir því hvenær það rennur út fyrir: ' + - category.name + - '. Vinsamlegast hafðu samband við Sýslumann', + meta: category.name, } } if (category.expires < inSixMonths) { return { canGetNewDuplicate: false, - summary: - 'Ökuskírteini útrunnið eða rennur út á næstu 6 mánuðum fyrir: ' + - category.name + - '. Vinsamlegast hafðu samband við Sýslumann', + meta: category.name, } } } return { canGetNewDuplicate: true, - summary: '', + meta: '', } } diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts index bba2693ab477..24a6d5062b98 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts @@ -49,7 +49,7 @@ export interface TeachingRightsStatus { export interface DrivinglicenseDuplicateValidityStatus { canGetNewDuplicate: boolean - summary: string + meta: string } export interface StudentQueryInput { diff --git a/libs/application/core/src/lib/messages.ts b/libs/application/core/src/lib/messages.ts index be1ce94b56cf..8cd720f43f32 100644 --- a/libs/application/core/src/lib/messages.ts +++ b/libs/application/core/src/lib/messages.ts @@ -501,6 +501,23 @@ export const coreErrorMessages = defineMessages({ description: 'Error message summary when a user already has icelandic citizenship', }, + drivingLicenseDuplicateEntryValidationErrorTitle: { + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationError', + defaultMessage: 'Ökuskírteini hæfir ekki umsókn um samrit', + description: 'Driving License duplicate entry validation error', + }, + drivingLicenseDuplicateEntryValidationSign400Error: { + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationError', + defaultMessage: 'Ógild tákntala, 400, fannst á ökuskírteini', + description: + 'Driving License duplicate entry validation error for sign (is: tákntala)', + }, + drivingLicenseDuplicateEntryValidationExpiredCategoryLicenseError: { + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationExpiredLicenseError', + defaultMessage: + 'Flokkur "{categoryName}" á ökukírteini er útrunninn eða rennur út innan 6 mánaða', + description: 'Driving License duplicate entry validation error', + }, drivingLicenseNoTeachingRightsTitle: { id: 'application.system:core.fetch.data.drivingLicenseNoTeachingRightsTitle', defaultMessage: 'Þú hefur ekki ökukennararéttindi í ökuskírteinaskrá.', diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts index 27ff12300da4..533911cf0891 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts @@ -9,6 +9,7 @@ import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { BaseTemplateApiService } from '../../base-template-api.service' import { TemplateApiError } from '@island.is/nest/problem' +import { coreErrorMessages } from '@island.is/application/core' @Injectable() export class DrivingLicenseDuplicateService extends BaseTemplateApiService { @@ -21,15 +22,27 @@ export class DrivingLicenseDuplicateService extends BaseTemplateApiService { } async canGetNewDuplicate({ auth }: TemplateApiModuleActionProps) { - const can = await this.drivingLicenseService.canGetNewDuplicate({ - token: auth.authorization, - }) + const can = await this.drivingLicenseService.canGetNewDuplicate( + auth.authorization, + ) if (!can.canGetNewDuplicate) { + let summary = + coreErrorMessages.drivingLicenseDuplicateEntryValidationSign400Error + if (can.meta) { + summary = + coreErrorMessages.drivingLicenseDuplicateEntryValidationExpiredCategoryLicenseError + } throw new TemplateApiError( { - title: 'Ökuskírteini hæfir ekki umsókn um samrit', + title: + coreErrorMessages.drivingLicenseDuplicateEntryValidationErrorTitle, description: '', - summary: can.summary, + summary: { + ...summary, + values: { + categoryName: can.meta, + }, + }, defaultMessage: '', }, 400, From 58dddf67ab28a9c29c268825b80ae3a340b6faf8 Mon Sep 17 00:00:00 2001 From: kksteini Date: Thu, 4 Jul 2024 09:28:27 +0000 Subject: [PATCH 6/6] Fix duplicate id --- libs/application/core/src/lib/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/application/core/src/lib/messages.ts b/libs/application/core/src/lib/messages.ts index 8cd720f43f32..16bfbfbaaba1 100644 --- a/libs/application/core/src/lib/messages.ts +++ b/libs/application/core/src/lib/messages.ts @@ -507,7 +507,7 @@ export const coreErrorMessages = defineMessages({ description: 'Driving License duplicate entry validation error', }, drivingLicenseDuplicateEntryValidationSign400Error: { - id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationError', + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationSign400Error', defaultMessage: 'Ógild tákntala, 400, fannst á ökuskírteini', description: 'Driving License duplicate entry validation error for sign (is: tákntala)',