1934 get stop roof from varustelutiedot table (#1938)

Divinare · web-flow · commit da88001e81d8 · 2021-06-09T11:25:02.000+03:00
* Get stop.roof from armamentInfo entity

* Small fix

* Small tweak
diff --git a/cypress/integration/nodeView.spec.js b/cypress/integration/nodeView.spec.js
@@ -225,9 +225,6 @@ const _fillStopRequiredFields = () => {
     cy.getTestElement('section').click();
     cy.getTestElement('dropdownOption').eq(2).click();
 
-    cy.getTestElement('roof').click();
-    cy.getTestElement('dropdownOption').first().click();
-
     cy.getTestElement('tariffi').click();
     cy.getTestElement('dropdownOption').first().click();
 };
diff --git a/src/codeLists/propertyCodeLists.ts b/src/codeLists/propertyCodeLists.ts
@@ -35,7 +35,6 @@ const stopPropertyCodeList: IStopPropertyCodeList = {
     modifiedBy: 'MUOKANNUT',
     modifiedOn: 'MUOKATTU PVM',
     platform: 'LAITURI',
-    roof: 'PYSÄKKIKATOS',
     radius: 'SÄDE',
     hastusId: 'HASTUS-PAIKKA',
     stopAreaId: 'PYSÄKKIALUE',
diff --git a/src/components/overlays/SavePrompt.tsx b/src/components/overlays/SavePrompt.tsx
@@ -130,7 +130,6 @@ const _getPropertyValue = (model: Model, property: string, data: Object | null,
         },
         stop: {
             municipality: () => codeListStore.getCodeListLabel('Kunta (KELA)', value),
-            roof: () => codeListStore.getCodeListLabel('Pysäkkityyppi', value),
             tariffi: () => codeListStore.getCodeListLabel('Tariffialue', value),
         },
         stopArea: {
diff --git a/src/components/sidebar/nodeView/StopForm.tsx b/src/components/sidebar/nodeView/StopForm.tsx
@@ -10,6 +10,7 @@ import InputContainer from '~/components/controls/InputContainer';
 import TextContainer from '~/components/controls/TextContainer';
 import ButtonType from '~/enums/buttonType';
 import { INode, IStop } from '~/models';
+import IArmamentInfo from '~/models/IArmamentInfo';
 import IHastusArea from '~/models/IHastusArea';
 import IStopArea from '~/models/IStopArea';
 import navigator from '~/routing/navigator';
@@ -48,34 +49,37 @@ interface IStopFormProps {
 }
 
 interface IStopFormState {
-    isRiseCountLoading: boolean;
-    riseCount: number;
+    isArmamentInfoLoading: boolean;
+    passengerCount: number;
+    roof: string;
 }
 
 @inject('codeListStore', 'nodeStore', 'modalStore')
 @observer
 class StopForm extends Component<IStopFormProps, IStopFormState> {
     state = {
-        isRiseCountLoading: true,
-        riseCount: 0,
+        isArmamentInfoLoading: true,
+        passengerCount: 0,
+        roof: '',
     };
     componentDidMount() {
-        this.fetchRiseCount();
+        this.fetchArmamentInfo();
     }
 
-    private fetchRiseCount = async () => {
+    private fetchArmamentInfo = async () => {
         if (this.props.isNewStop) {
             return;
         }
         this.setState({
-            isRiseCountLoading: true,
+            isArmamentInfoLoading: true,
         });
-        const riseCount = await StopService.fetchRiseCount({
+        const armamentInfo: IArmamentInfo = await StopService.fetchArmamentInfo({
             nodeId: this.props.node.id,
         });
         this.setState({
-            riseCount,
-            isRiseCountLoading: false,
+            passengerCount: armamentInfo.passengerCount,
+            roof: armamentInfo.roof,
+            isArmamentInfoLoading: false,
         });
     };
 
@@ -360,13 +364,11 @@ class StopForm extends Component<IStopFormProps, IStopFormState> {
                             data-cy='section'
                         />
                         <Dropdown
-                            onChange={updateStopProperty!('roof')}
                             items={this.props.codeListStore!.getDropdownItemList('Pysäkkityyppi')}
-                            selected={stop.roof}
-                            disabled={isEditingDisabled}
+                            selected={this.state.roof}
+                            isLoading={this.state.isArmamentInfoLoading}
+                            disabled={true}
                             label='PYSÄKKIKATOS'
-                            validationResult={stopInvalidPropertiesMap['roof']}
-                            data-cy='roof'
                         />
                     </div>
                     <div className={s.flexRow}>
@@ -445,9 +447,9 @@ class StopForm extends Component<IStopFormProps, IStopFormState> {
                     {!this.props.isNewStop && (
                         <div className={s.flexRow}>
                             <TextContainer
-                                isLoading={this.state.isRiseCountLoading}
+                                isLoading={this.state.isArmamentInfoLoading}
                                 label='NOUSIJAMÄÄRÄ'
-                                value={this.state.riseCount}
+                                value={this.state.passengerCount}
                             />
                         </div>
                     )}
diff --git a/src/factories/nodeStopFactory.ts b/src/factories/nodeStopFactory.ts
@@ -22,7 +22,6 @@ class StopFactory {
             placeNameFi: node.pyspaikannimi,
             placeNameSw: node.pyspaikannimir,
             platform: node.pyslaituri,
-            roof: node.pyskatos,
             postalNumber: node.postinro,
             section: node.vyohyke,
         };
@@ -48,7 +47,6 @@ class StopFactory {
             placeNameFi: '',
             placeNameSw: '',
             platform: '',
-            roof: '',
             postalNumber: '',
             section: '',
         };
diff --git a/src/models/IArmamentInfo.ts b/src/models/IArmamentInfo.ts
@@ -0,0 +1,6 @@
+interface IArmamentInfo {
+    passengerCount: number;
+    roof: string;
+}
+
+export default IArmamentInfo;
diff --git a/src/models/IStop.ts b/src/models/IStop.ts
@@ -13,7 +13,6 @@ export default interface IStop extends IStopPrimaryKey {
     modifiedBy?: string;
     modifiedOn?: Date;
     platform?: string;
-    roof: string;
     radius: number;
     hastusId?: string;
     stopAreaId?: string;
diff --git a/src/models/externals/IExternalArmamentInfo.ts b/src/models/externals/IExternalArmamentInfo.ts
@@ -0,0 +1,6 @@
+interface IExternalArmamentInfo {
+    nousijat: number;
+    pysakkityyppi: string;
+}
+
+export default IExternalArmamentInfo;
diff --git a/src/models/externals/IExternalStop.ts b/src/models/externals/IExternalStop.ts
@@ -11,7 +11,6 @@ export default interface IExternalStop {
     pyskuka?: string;
     pysviimpvm?: Date;
     pyslaituri?: string;
-    pyskatos: string;
     pystyyppi: string;
     pyssade: number;
     pyssuunta: string;
diff --git a/src/models/validationModels/stopValidationModel.ts b/src/models/validationModels/stopValidationModel.ts
@@ -21,7 +21,6 @@ const stopValidationModel: IStopValidationModel = {
     modifiedBy: '',
     modifiedOn: '',
     platform: `min:0|max:3|string`,
-    roof: 'required|min:2|max:2|string',
     radius: `required|min:0|max:${constants.INTEGER_MAX_VALUE}|numeric`,
     hastusId: 'min:0|max:6|string',
     stopAreaId: 'required|min:0|max:6|string',
diff --git a/src/services/graphqlQueries.ts b/src/services/graphqlQueries.ts
@@ -305,6 +305,7 @@ const getArmamentInfoQuery = () => {
         query getArmamentInfoQuery($nodeId: String!) {
             node: varustelutiedotUusiByTunnus(tunnus: $nodeId) {
                 nousijat
+                pysakkityyppi
             }
         }
     `;
@@ -600,7 +601,6 @@ const stopQueryFields = `
     pyskuka
     pysviimpvm
     pyslaituri
-    pyskatos
     pystyyppi
     pyssade
     pyssuunta
diff --git a/src/services/stopService.ts b/src/services/stopService.ts
@@ -3,11 +3,13 @@ import _ from 'lodash';
 import EndpointPath from '~/enums/endpointPath';
 import NodeStopFactory from '~/factories/nodeStopFactory';
 import ApolloClient from '~/helpers/ApolloClient';
-import IHastusArea, { IHastusAreaSaveModel } from '~/models/IHastusArea';
-import IStop, { IStopItem } from '~/models/IStop';
+import IExternalArmamentInfo from '~/models/externals/IExternalArmamentInfo';
 import IExternalHastusArea from '~/models/externals/IExternalHastusArea';
 import IExternalNode from '~/models/externals/IExternalNode';
 import IExternalStop, { IExternalStopItem } from '~/models/externals/IExternalStop';
+import IArmamentInfo from '~/models/IArmamentInfo';
+import IHastusArea, { IHastusAreaSaveModel } from '~/models/IHastusArea';
+import IStop, { IStopItem } from '~/models/IStop';
 import HttpUtils from '~/utils/HttpUtils';
 import GraphqlQueries from './graphqlQueries';
 import NodeService from './nodeService';
@@ -138,14 +140,25 @@ class StopService {
         await HttpUtils.updateObject(EndpointPath.HASTUS_AREA, hastusAreaSaveModel);
     };
 
-    public static fetchRiseCount = async ({ nodeId }: { nodeId: string }): Promise<number> => {
+    public static fetchArmamentInfo = async ({
+        nodeId,
+    }: {
+        nodeId: string;
+    }): Promise<IArmamentInfo> => {
         const queryResult: ApolloQueryResult<any> = await ApolloClient.query({
             query: GraphqlQueries.getArmamentInfoQuery(),
             variables: { nodeId },
         });
-        return queryResult && queryResult.data && queryResult.data.node
-            ? queryResult.data.node.nousijat
-            : 0;
+        const externalArmamentInfo: IExternalArmamentInfo | null = queryResult?.data?.node;
+        return externalArmamentInfo
+            ? {
+                  passengerCount: externalArmamentInfo.nousijat,
+                  roof: externalArmamentInfo.pysakkityyppi,
+              }
+            : {
+                  passengerCount: 0,
+                  roof: '',
+              };
     };
 }
 
diff --git a/tslint.json b/tslint.json
@@ -22,7 +22,7 @@
         "ordered-imports": [
             true,
             {
-                "import-sources-order": "lowercase-last",
+                "import-sources-order": "any",
                 "named-imports-order": "lowercase-first"
             }
         ],
