fix: update complaint submission (#37)

Author: AvivAbachi

gov_api/postman.json

@@ -1 +1 @@
-{"info":{"_postman_id":"3a3e0068-8ed8-4464-b3e1-90fb3b3d2103","name":"PniotMot","schema":"https://schema.getpostman.com/json/collection/v2.1.0/collection.json","description":""},"item":[{"name":"GetLinesByStation","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/trafficLicensing/GetLines","path":["govServiceList","trafficLicensing","GetLines"],"protocol":"https","host":["esb","gov","il"]},"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"EventDate\": \"13/05/2025\",\n  \"OperatorId\": 3,\n  \"StationId\": 57865\n}"}}},{"name":"GetStationByLine","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/trafficLicensing/GetStationToLine","path":["govServiceList","trafficLicensing","GetStationToLine"],"protocol":"https","host":["esb","gov","il"]},"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"eventDate\": \"13/05/2025\",\n  \"OperatorId\": 3,\n  \"OfficelineId\": 12083,\n  \"Directions\": [\n    1\n  ]\n}"}}},{"name":"GetSubjects","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/ListProvider/GetList","path":["govServiceList","ListProvider","GetList"],"protocol":"https","host":["esb","gov","il"]},"header":[{"key":"Accept","value":"*/*","disabled":true},{"key":"User-Agent","value":"Thunder Client (https://www.thunderclient.com)","disabled":true}],"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"listName\": \"subject_type_vehicles\"\n}"}}},{"name":"GetTrainStations","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/trafficLicensing/GetTrainStations","path":["govServiceList","trafficLicensing","GetTrainStations"],"protocol":"https","host":["esb","gov","il"]},"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"StationTypeId\": 7\n}"}}},{"name":"GetPniya(Vehicles Type)","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/ListProvider/GetList","path":["govServiceList","ListProvider","GetList"],"protocol":"https","host":["esb","gov","il"]},"header":[{"key":"Accept","value":"*/*","disabled":true},{"key":"User-Agent","value":"Thunder Client (https://www.thunderclient.com)","disabled":true}],"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"listName\": \"pniya\"\n}"}}},{"name":"GetNotRealNumbers","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/ListProvider/GetList","path":["govServiceList","ListProvider","GetList"],"protocol":"https","host":["esb","gov","il"]},"header":[{"key":"Accept","value":"*/*","disabled":true},{"key":"User-Agent","value":"Thunder Client (https://www.thunderclient.com)","disabled":true}],"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"listName\": \"notrealnumbers\"\n}"}}},{"name":"GetLinesByLine","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/trafficLicensing/GetLines","path":["govServiceList","trafficLicensing","GetLines"],"protocol":"https","host":["esb","gov","il"]},"body":{"mode":"raw","options":{"raw":{"language":"json"}},"raw":"{\n  \"eventDate\": \"13/05/2025\",\n  \"OperatorId\": 3,\n  \"OperatorLineId\": 83\n}"}}},{"name":"GetCities","request":{"method":"POST","url":{"raw":"https://esb.gov.il/govServiceList/trafficLicensing/GetCities","path":["govServiceList","trafficLicensing","GetCities"],"protocol":"https","host":["esb","gov","il"]}}},{"name":"GetTime","request":{"method":"GET","url":{"raw":"https://esb.gov.il/govServiceList/TSA/GetTime?_=1747161247807","query":[{"key":"_","value":"1747161247807"}],"variable":[],"path":["govServiceList","TSA","GetTime"],"protocol":"https","host":["esb","gov","il"]}}},{"name":"Submit","request":{"method":"POST","url":{"raw":"https://forms.gov.il/globaldata/getsequence/setform.aspx?displang=he&formtype=PniotMot%40mot.gov.il","query":[{"key":"displang","value":"he"},{"key":"formtype","value":"PniotMot%40mot.gov.il"}],"variable":[],"path":["globaldata","getsequence","setform.aspx"],"protocol":"https","host":["forms","gov","il"]},"header":[{"key":"Content-Type","value":"multipart/form-data"}],"body":{"mode":"file","file":{"src":"c:\\Users\\aviva\\Downloads\\PniotMot@mot.gov.il_20250513_1908.xml"}}}}]}
+{"info":{"_postman_id":"0f6e4879-d1a7-4beb-9ecd-2f61fd69ecc2","name":"PniotMot","schema":"https://schema.getpostman.com/json/collection/v2.1.0/collection.json","_exporter_id":"14533538","_collection_link":"https://go.postman.co/collection/14533538-0f6e4879-d1a7-4beb-9ecd-2f61fd69ecc2?source=collection_link"},"item":[{"name":"GetReferenceNumber","request":{"method":"GET","header":[],"url":{"raw":"https://govforms.gov.il/mw/forms/PublicTransportRequest@mot.gov.il","protocol":"https","host":["govforms","gov","il"],"path":["mw","forms","PublicTransportRequest@mot.gov.il"]}},"response":[]},{"name":"GetCities","request":{"method":"GET","header":[{"key":"applicationid","value":"{{requestID}}","type":"text"}],"url":{"raw":"https://govforms.gov.il/govLists/City?columns[0]=city_code&columns[1]=city_name_he","protocol":"https","host":["govforms","gov","il"],"path":["govLists","City"],"query":[{"key":"columns[0]","value":"city_code"},{"key":"columns[1]","value":"city_name_he"}]}},"response":[]},{"name":"GetTransport","request":{"method":"GET","header":[{"key":"applicationid","value":"{{requestID}}","type":"text"}],"url":{"raw":"https://govforms.gov.il/govLists/TransportMeans?columns[0]=TransportMeansCode&columns[1]=TransportMeans","protocol":"https","host":["govforms","gov","il"],"path":["govLists","TransportMeans"],"query":[{"key":"columns[0]","value":"TransportMeansCode"},{"key":"columns[1]","value":"TransportMeans"}]}},"response":[]},{"name":"GetSubject","request":{"method":"GET","header":[{"key":"applicationid","value":"{{requestID}}","type":"text"}],"url":{"raw":"https://govforms.gov.il/govLists/RequestSubjectTran?columns[0]=RequestSubjectTranCode&columns[1]=RequestSubjectTran&filters[TransportMeansCode]=1","protocol":"https","host":["govforms","gov","il"],"path":["govLists","RequestSubjectTran"],"query":[{"key":"columns[0]","value":"RequestSubjectTranCode"},{"key":"columns[1]","value":"RequestSubjectTran"},{"key":"filters[TransportMeansCode]","value":"1","description":"1 bus\n2 taxi\n3 train\n4 rahbal\n5 carmelit"}]}},"response":[]},{"name":"GetComplaintAppeal","request":{"method":"GET","header":[{"key":"applicationid","value":"{{requestID}}","type":"text"}],"url":{"raw":"https://govforms.gov.il/govLists/RequestComplaintAppealTran?columns[0]=RequestComplaintAppealTranCode&columns[1]=RequestComplaintAppealTran&columns[2]=RequestComplaintAppealTranText&filters[RequestSubjectTranCode]=1&options.asdesignedcolumns[0]=RequestComplaintAppealTranText","protocol":"https","host":["govforms","gov","il"],"path":["govLists","RequestComplaintAppealTran"],"query":[{"key":"columns[0]","value":"RequestComplaintAppealTranCode"},{"key":"columns[1]","value":"RequestComplaintAppealTran"},{"key":"columns[2]","value":"RequestComplaintAppealTranText"},{"key":"filters[RequestSubjectTranCode]","value":"1","description":"1 - bus - זמנים ואי עצירה\n2 - bus - תלונה על שירות אמצעי תחבורה\n3 - bus - בקשה לשינויים בשירות\n4 - bus - תעריפים ותשלומים\n\n5 - taxi - תלונה על שירות אמצעי תחבורה\n6 - taxi - תעריפים ותשלומים\n\n7 - train - זמנים ואי עצירה\n8 - train - תלונה על שירות אמצעי תחבורה\n9 - train - בקשה לשינויים בשירות\n10 - train - תעריפים ותשלומים\n\n11 - cable car - תלונה על שירות אמצעי תחבורה\n12 - cable car - תעריפים ותשלומים\n\n13 - carmelit - תלונה על שירות אמצעי תחבורה\n14 - carmelit - תעריפים ותשלומים"},{"key":"options.asdesignedcolumns[0]","value":"RequestComplaintAppealTranText"}]}},"response":[]},{"name":"GetTrainStation","request":{"method":"POST","header":[],"body":{"mode":"raw","raw":"{\r\n    \"MappingId\": \"739b1f3a-0bcb-4a1d-f6d8-08dda272749e\",\r\n    \"RequestId\": \"{{requestID}}\",\r\n    \"Options\": {},\r\n    \"InputParams\": {\r\n        \"operatorTypeId\": 1\r\n        // 2 light train\r\n        // 3 israel railway\r\n        // 4 service taxi\r\n        // 8 rahbal\r\n    },\r\n    \"processID\": null\r\n}","options":{"raw":{"language":"json"}}},"url":{"raw":"https://govforms.gov.il/MW/serviceCall/invoke","protocol":"https","host":["govforms","gov","il"],"path":["MW","serviceCall","invoke"]}},"response":[]},{"name":"GetBusStation","request":{"method":"POST","header":[],"body":{"mode":"raw","raw":"{\r\n    \"MappingId\": \"7c7a1bf8-8725-4879-f6df-08dda272749e\",\r\n    \"RequestId\": \"{{requestID}}\",\r\n    \"Options\": {},\r\n    \"InputParams\": {\r\n        \"routeId\": 36503,// lineDetailRecordId\r\n        \"eventDate\": \"2026-05-18T00:00:00.000Z\",\r\n        \"eventHour2\": \"10:00\",\r\n        \"operatorTypeId\": 1\r\n        // 1 bus\r\n    },\r\n\r\n    \"processID\": null\r\n}","options":{"raw":{"language":"json"}}},"url":{"raw":"https://govforms.gov.il/MW/serviceCall/invoke","protocol":"https","host":["govforms","gov","il"],"path":["MW","serviceCall","invoke"]}},"response":[]},{"name":"GetLines","request":{"method":"POST","header":[],"body":{"mode":"raw","raw":"{\r\n    \"MappingId\": \"65b6e90d-bcc6-452d-f6d5-08dda272749e\",\r\n    \"RequestId\": \"{{requestID}}\",\r\n    \"Options\": {},\r\n    \"InputParams\": {\r\n        \"operatorTypeId\": 8\r\n        // 1 bus\r\n        // 2 light train\r\n        // 3 israel railway\r\n        // 4 service taxi\r\n        // 5 carmelit\r\n        // 8 rahbal\r\n        // \"operatorLineId\": 129\r\n    },\r\n    \"processID\": null\r\n}","options":{"raw":{"language":"json"}}},"url":{"raw":"https://govforms.gov.il/MW/serviceCall/invoke","protocol":"https","host":["govforms","gov","il"],"path":["MW","serviceCall","invoke"]}},"response":[]}]}

src/controllers/complaints.controller.js

@@ -19,11 +19,11 @@ export async function sendComplaint(request, reply) {
 
     request.log.info('Complaint submission started');
 
-    const clientData = isDebug ? { ref: '1234567', guid: 'test' } : await getReferenceNumber();
+    const clientData = isDebug ? { referenceNumber: '1234567', requestID: 'test' } : await getReferenceNumber();
 
     if (clientData === null) return reply.status(500).send({ success: false, error: 'Failed to get reference number' });
 
-    const xml = templateBuilder(request.body, clientData.ref);
+    const xml = templateBuilder(request.body, clientData.referenceNumber);
 
     const boundary = `----WebKitFormBoundary${crypto.randomBytes(16).toString('hex')}`;
 
@@ -39,14 +39,14 @@ export async function sendComplaint(request, reply) {
       `--${boundary}`,
       'Content-Disposition: form-data; name="_form_guid"',
       '',
-      clientData.guid,
+      clientData.requestID,
       `--${boundary}--`,
       '',
     ].join('\r\n');
 
     if (isDebug) {
       request.log.info('Complaint submitted in debug mode');
-      return reply.status(200).send({ success: true, debug: true, xml, ref: clientData.ref });
+      return reply.status(200).send({ success: true, debug: true, xml, ref: clientData.referenceNumber });
       // for test xml resepnse
       // return reply.status(200).headers({ 'content-type': 'application/xml' }).send(xml);
     }
@@ -76,9 +76,9 @@ export async function sendComplaint(request, reply) {
       return reply.status(400).send({ error: 'Validation failed', message: 'Government API error' });
     }
 
-    request.log.info('Complaint submitted successfully', { referenceNumber: clientData.ref, status: response.status });
+    request.log.info('Complaint submitted successfully', { referenceNumber: clientData.referenceNumber, status: response.status });
 
-    return reply.status(200).send({ success: true, debug: false, data: text, referenceNumber: clientData.ref });
+    return reply.status(200).send({ success: true, debug: false, data: text, referenceNumber: clientData.referenceNumber });
   } catch (error) {
     request.log.error('Complaint submission failed', { error: error.message, stack: error.stack, body: request.body });
     // Handle validation errors

src/utils/getReferenceNumber.js

@@ -1,16 +1,37 @@
 import { load } from 'cheerio';
 import ky from 'ky';
 
-const URL = 'https://forms.gov.il/globaldata/getsequence/getHtmlForm.aspx?formType=PniotMot%40mot.gov.il';
+const URL = 'https://govforms.gov.il/mw/forms/PublicTransportRequest@mot.gov.il';
+
+function getFormParams(dom) {
+  const script = dom('#govFormsScript').html();
+  const match = script?.match(/var\s+formParams\s*=\s*(?<formParams>\{[\s\S]*\})\s*;?\s*$/u);
+
+  if (!match) return null;
+
+  try {
+    return JSON.parse(match.groups.formParams);
+  } catch {
+    return null;
+  }
+}
 
 export async function getReferenceNumber() {
   const response = await ky.get(URL);
   const html = await response.text();
   const dom = load(html);
-  const ref = dom('#ReferenceNumber').text().trim();
-  const guid = dom('#_form_guid').val();
+  const process = getFormParams(dom)?.process;
+  const requestID = process?.requestID;
+  const referenceNumber = process?.referenceNumber;
+  const formUniqueID = process?.formUniqueID;
 
-  if (!ref || !guid) return null;
+  if (requestID && referenceNumber !== undefined && referenceNumber !== null) {
+    return {
+      formUniqueID,
+      referenceNumber: String(referenceNumber),
+      requestID,
+    };
+  }
 
-  return { ref, guid };
+  return null;
 }

tests/getReferenceNumber.test.js

@@ -16,14 +16,26 @@ describe('getReferenceNumber', () => {
     cleanup();
   });
 
-  it('should return the reference number', async () => {
-    get.resolves({ text: () => Promise.resolve('<span id="ReferenceNumber">1234567</span><input id="_form_guid" value="test-guid">') });
+  it('should return the reference number and request id from formParams', async () => {
+    get.resolves({
+      text: () =>
+        Promise.resolve(`<script type="text/javascript" id="govFormsScript"> var formParams = {
+  "process": {
+    "formUniqueID": "UJdQLbqX3BF1jDydDZJ0fQ",
+    "requestID": "ff9869f2-aeec-4f37-a673-aa9ba23406b1",
+    "referenceNumber": 143098
+  }
+}</script>`),
+    });
     const result = await getReferenceNumber();
-    expect(result.ref).to.equal('1234567');
-    expect(result.guid).to.equal('test-guid');
+    expect(result).to.deep.equal({
+      formUniqueID: 'UJdQLbqX3BF1jDydDZJ0fQ',
+      referenceNumber: '143098',
+      requestID: 'ff9869f2-aeec-4f37-a673-aa9ba23406b1',
+    });
   });
 
-  it('should return null if #ReferenceNumber not found', async () => {
+  it('should return null if formParams process identifiers are not found', async () => {
     get.resolves({ text: () => Promise.resolve('<div>No ref</div>') });
     const result = await getReferenceNumber();
     expect(result).to.be.null;