Merge pull request #348 from ImisDevelopers/dev

Dev
ImisDevelopers · May 18, 2020 · 1c24e86 · 1c24e86
2 parents 203445f + 6028a48
commit 1c24e86
Show file tree

Hide file tree

Showing 49 changed files with 1,583 additions and 1,971 deletions.
diff --git a/client/.editorconfig b/client/.editorconfig
diff --git a/client/.eslintrc.js b/client/.eslintrc.js
@@ -6,33 +6,19 @@ module.exports = {
     node: true,
   },
   extends: [
-    'plugin:@typescript-eslint/recommended',
     'plugin:vue/essential',
-    '@vue/standard',
+    'eslint:recommended',
     '@vue/typescript/recommended',
+    '@vue/prettier',
+    '@vue/prettier/@typescript-eslint',
   ],
   parserOptions: {
     parser: '@typescript-eslint/parser',
     ecmaVersion: 2020,
   },
   rules: {
-    // '@typescript-eslint/rule-name': 'error',
     '@typescript-eslint/no-extra-semi': 'error',
-
-    'no-console': 'off', // process.env.NODE_ENV === 'production' ? 'error' :
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'comma-dangle': [
-      'error',
-      {
-        arrays: 'always-multiline',
-        objects: 'always-multiline',
-        imports: 'always-multiline',
-        exports: 'always-multiline',
-        functions: 'always-multiline',
-      },
-    ],
-    'space-before-function-paren': ['error', 'never'],
-    'object-curly-spacing': ['error', 'always'],
+    '@typescript-eslint/no-explicit-any': 'off',
   },
   overrides: [
     {

diff --git a/client/.prettierignore b/client/.prettierignore
@@ -0,0 +1 @@
+SwaggerApi.ts
diff --git a/client/.prettierrc.yml b/client/.prettierrc.yml
@@ -0,0 +1,5 @@
+trailingComma: "es5"
+useTabs: false
+tabWidth: 2
+semi: false
+singleQuote: true
diff --git a/client/babel.config.js b/client/babel.config.js
@@ -1,5 +1,3 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset',
-  ],
+  presets: ['@vue/cli-plugin-babel/preset'],
 }
diff --git a/client/package.json b/client/package.json
@@ -36,17 +36,21 @@
     "@vue/cli-plugin-unit-mocha": "~4.2.0",
     "@vue/cli-plugin-vuex": "~4.2.0",
     "@vue/cli-service": "~4.2.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-standard": "^5.1.0",
-    "@vue/eslint-config-typescript": "^5.0.1",
+    "@vue/eslint-config-typescript": "^5.0.2",
     "@vue/test-utils": "1.0.0-beta.31",
     "chai": "^4.1.2",
     "eslint": "^6.7.2",
+    "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.1.2",
     "node-sass": "^4.12.0",
+    "prettier": "^2.0.5",
     "sass-loader": "^8.0.2",
     "swagger-typescript-api": "^1.7.2",
     "typescript": "~3.7.5",

diff --git a/client/src/api/SwaggerApi.ts b/client/src/api/SwaggerApi.ts
@@ -12,6 +12,11 @@
 
 export type AggregationResultZip = object;
 
+export interface ApiFunctionSpec {
+  method?: string;
+  path?: string;
+}
+
 export interface AuthRequestDTO {
   password?: string;
   username?: string;
@@ -44,6 +49,7 @@ export interface CreateInstitutionDTO {
 
 export interface CreateLabTestDTO {
   comment?: string;
+  eventDate?: string;
   laboratoryId?: string;
   patientId?: string;
   testId?: string;
@@ -85,7 +91,10 @@ export interface CreatePatientDTO {
     | "TEST_FINISHED_NOT_RECOVERED"
     | "PATIENT_DEAD"
     | "DOCTORS_VISIT"
-    | "QUARANTINE_MANDATED";
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
   phoneNumber?: string;
   preIllnesses?: string[];
   quarantineUntil?: string;
@@ -155,6 +164,32 @@ export interface GrantedAuthority {
   authority?: string;
 }
 
+export interface Incident {
+  caseId?: string;
+  eventDate?: string;
+  eventType?:
+    | "REGISTERED"
+    | "SUSPECTED"
+    | "ORDER_TEST"
+    | "SCHEDULED_FOR_TESTING"
+    | "TEST_SUBMITTED_IN_PROGRESS"
+    | "TEST_FINISHED_POSITIVE"
+    | "TEST_FINISHED_NEGATIVE"
+    | "TEST_FINISHED_INVALID"
+    | "TEST_FINISHED_RECOVERED"
+    | "TEST_FINISHED_NOT_RECOVERED"
+    | "PATIENT_DEAD"
+    | "DOCTORS_VISIT"
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
+  id?: string;
+  patient?: Patient;
+  versionTimestamp?: string;
+  versionUser?: User;
+}
+
 export interface Institution {
   city?: string;
   comment?: string;
@@ -349,7 +384,10 @@ export interface Patient {
     | "TEST_FINISHED_NOT_RECOVERED"
     | "PATIENT_DEAD"
     | "DOCTORS_VISIT"
-    | "QUARANTINE_MANDATED";
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
   phoneNumber?: string;
   preIllnesses?: string[];
   quarantineUntil?: string;
@@ -392,7 +430,10 @@ export interface PatientEvent {
     | "TEST_FINISHED_NOT_RECOVERED"
     | "PATIENT_DEAD"
     | "DOCTORS_VISIT"
-    | "QUARANTINE_MANDATED";
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
   id?: string;
   illness?: "CORONA";
   labTest?: LabTest;
@@ -430,8 +471,29 @@ export interface PatientSearchParamsDTO {
     | "TEST_FINISHED_NOT_RECOVERED"
     | "PATIENT_DEAD"
     | "DOCTORS_VISIT"
-    | "QUARANTINE_MANDATED";
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
   phoneNumber?: string;
+  quarantineStatus?: Array<
+    | "REGISTERED"
+    | "SUSPECTED"
+    | "ORDER_TEST"
+    | "SCHEDULED_FOR_TESTING"
+    | "TEST_SUBMITTED_IN_PROGRESS"
+    | "TEST_FINISHED_POSITIVE"
+    | "TEST_FINISHED_NEGATIVE"
+    | "TEST_FINISHED_INVALID"
+    | "TEST_FINISHED_RECOVERED"
+    | "TEST_FINISHED_NOT_RECOVERED"
+    | "PATIENT_DEAD"
+    | "DOCTORS_VISIT"
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED"
+  >;
   street?: string;
   zip?: string;
 }
@@ -444,6 +506,34 @@ export interface PatientSimpleSearchParamsDTO {
   query?: string;
 }
 
+export interface QuarantineIncident {
+  caseId?: string;
+  comment?: string;
+  eventDate?: string;
+  eventType?:
+    | "REGISTERED"
+    | "SUSPECTED"
+    | "ORDER_TEST"
+    | "SCHEDULED_FOR_TESTING"
+    | "TEST_SUBMITTED_IN_PROGRESS"
+    | "TEST_FINISHED_POSITIVE"
+    | "TEST_FINISHED_NEGATIVE"
+    | "TEST_FINISHED_INVALID"
+    | "TEST_FINISHED_RECOVERED"
+    | "TEST_FINISHED_NOT_RECOVERED"
+    | "PATIENT_DEAD"
+    | "DOCTORS_VISIT"
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
+  id?: string;
+  patient?: Patient;
+  until?: string;
+  versionTimestamp?: string;
+  versionUser?: User;
+}
+
 export interface RegisterUserRequest {
   firstName?: string;
   lastName?: string;
@@ -458,9 +548,32 @@ export interface RequestLabTestDTO {
   patientId?: string;
 }
 
-export interface SendToQuarantineDTO {
+export interface RequestQuarantineDTO {
   comment?: string;
   dateUntil?: string;
+  eventDate?: string;
+  status?:
+    | "REGISTERED"
+    | "SUSPECTED"
+    | "ORDER_TEST"
+    | "SCHEDULED_FOR_TESTING"
+    | "TEST_SUBMITTED_IN_PROGRESS"
+    | "TEST_FINISHED_POSITIVE"
+    | "TEST_FINISHED_NEGATIVE"
+    | "TEST_FINISHED_INVALID"
+    | "TEST_FINISHED_RECOVERED"
+    | "TEST_FINISHED_NOT_RECOVERED"
+    | "PATIENT_DEAD"
+    | "DOCTORS_VISIT"
+    | "QUARANTINE_SELECTED"
+    | "QUARANTINE_MANDATED"
+    | "QUARANTINE_RELEASED"
+    | "QUARANTINE_PROFESSIONBAN_RELEASED";
+}
+
+export interface SendToQuarantineDTO {
+  eventDate?: string;
+  patientIds?: string[];
 }
 
 export interface Timestamp {
@@ -482,6 +595,7 @@ export interface TokenDTO {
 
 export interface UpdateTestStatusDTO {
   comment?: string;
+  eventDate?: string;
   file?: string;
   status?: "TEST_SUBMITTED" | "TEST_IN_PROGRESS" | "TEST_POSITIVE" | "TEST_NEGATIVE" | "TEST_INVALID";
   testId?: string;
@@ -803,6 +917,79 @@ export class Api<SecurityDataType = any> extends HttpClient<SecurityDataType> {
     removeExposureContactUsingDelete: (id: number, params?: RequestParams) =>
       this.request<any, any>(`/api/exposure-contacts/${id}`, "DELETE", params, null, true),
 
+    /**
+     * @tags incident-controller
+     * @name getPatientCurrentUsingGET
+     * @summary getPatientCurrent
+     * @request GET:/api/incidents/patient/{id}
+     * @secure
+     */
+    getPatientCurrentUsingGet: (id: string, params?: RequestParams) =>
+      this.request<Incident[], any>(`/api/incidents/patient/${id}`, "GET", params, null, true),
+
+    /**
+     * @tags incident-controller
+     * @name getPatientLogUsingGET
+     * @summary getPatientLog
+     * @request GET:/api/incidents/patient/{id}/log
+     * @secure
+     */
+    getPatientLogUsingGet: (id: string, params?: RequestParams) =>
+      this.request<Incident[], any>(`/api/incidents/patient/${id}/log`, "GET", params, null, true),
+
+    /**
+     * @tags incident-controller
+     * @name getSelectedForQuarantineUsingGET
+     * @summary getSelectedForQuarantine
+     * @request GET:/api/incidents/selected-for-quarantine
+     * @secure
+     */
+    getSelectedForQuarantineUsingGet: (params?: RequestParams) =>
+      this.request<QuarantineIncident[], any>(`/api/incidents/selected-for-quarantine`, "GET", params, null, true),
+
+    /**
+     * @tags incident-controller
+     * @name getIncidentUsingGET
+     * @summary getIncident
+     * @request GET:/api/incidents/{id}
+     * @secure
+     */
+    getIncidentUsingGet: (id: string, params?: RequestParams) =>
+      this.request<Incident, any>(`/api/incidents/${id}`, "GET", params, null, true),
+
+    /**
+     * @tags incident-controller
+     * @name getLogUsingGET
+     * @summary getLog
+     * @request GET:/api/incidents/{id}/log
+     * @secure
+     */
+    getLogUsingGet: (id: string, params?: RequestParams) =>
+      this.request<Incident[], any>(`/api/incidents/${id}/log`, "GET", params, null, true),
+
+    /**
+     * @tags incident-controller
+     * @name getPatientCurrentByTypeUsingGET
+     * @summary getPatientCurrentByType
+     * @request GET:/api/incidents/{type}/patient/{id}
+     * @secure
+     */
+    getPatientCurrentByTypeUsingGet: (
+      id: string,
+      type: "test" | "quarantine" | "administrative",
+      params?: RequestParams,
+    ) => this.request<Incident[], any>(`/api/incidents/${type}/patient/${id}`, "GET", params, null, true),
+
+    /**
+     * @tags incident-controller
+     * @name getPatientLogByTypeUsingGET
+     * @summary getPatientLogByType
+     * @request GET:/api/incidents/{type}/patient/{id}/log
+     * @secure
+     */
+    getPatientLogByTypeUsingGet: (id: string, type: "test" | "quarantine" | "administrative", params?: RequestParams) =>
+      this.request<Incident[], any>(`/api/incidents/${type}/patient/${id}/log`, "GET", params, null, true),
+
     /**
      * @tags institution-controller
      * @name createInstitutionUsingPOST
@@ -949,10 +1136,20 @@ export class Api<SecurityDataType = any> extends HttpClient<SecurityDataType> {
      * @tags patient-controller
      * @name sendToQuarantineUsingPOST
      * @summary sendToQuarantine
+     * @request POST:/api/patients/quarantine
+     * @secure
+     */
+    sendToQuarantineUsingPost: (dto: SendToQuarantineDTO, params?: RequestParams) =>
+      this.request<any, any>(`/api/patients/quarantine`, "POST", params, dto, true),
+
+    /**
+     * @tags patient-controller
+     * @name requestQuarantineUsingPOST
+     * @summary requestQuarantine
      * @request POST:/api/patients/quarantine/{id}
      * @secure
      */
-    sendToQuarantineUsingPost: (id: string, statusDTO: SendToQuarantineDTO, params?: RequestParams) =>
+    requestQuarantineUsingPost: (id: string, statusDTO: RequestQuarantineDTO, params?: RequestParams) =>
       this.request<Patient, any>(`/api/patients/quarantine/${id}`, "POST", params, statusDTO, true),
 
     /**
@@ -1011,6 +1208,16 @@ export class Api<SecurityDataType = any> extends HttpClient<SecurityDataType> {
     getPatientForIdUsingGet: (id: string, params?: RequestParams) =>
       this.request<Patient, any>(`/api/patients/${id}`, "GET", params, null, true),
 
+    /**
+     * @tags permission-query-controller
+     * @name queryPermissionsUsingPOST
+     * @summary queryPermissions
+     * @request POST:/api/permissions
+     * @secure
+     */
+    queryPermissionsUsingPost: (items: Record<string, ApiFunctionSpec>, params?: RequestParams) =>
+      this.request<Record<string, boolean>, any>(`/api/permissions`, "POST", params, items, true),
+
     /**
      * @tags stats-controller
      * @name getForZipUsingGET