Added Merdian to Preorder export and AdressDB find/search API

Layout/default/Preorder/export.csv.php

@@ -3,7 +3,7 @@ ob_end_flush();
 header("Content-type: text/csv");
 header('Content-disposition: attachment; filename="preorder-export-'.date('Y-m-d_H-i-s').'.csv"');
 ?>
-Kampagne;Netzgebiet ID;Netzgebiet;Extref;Bestellcode;OAID;Bestelltyp;Status;Anschlusstyp;GWR Adresscode;RW;HW;Anschluss Strasse;Anschluss Hausnummer;Anschluss PLZ;Anschluss Ort;Anschluss Wohneinheit;GPS Breite;GPS Länge;Anzahl Anschlüsse;Kunde Firma;Kunde UID;Kunde Vorname;Kunde Nachname;Kunde Strasse;Kunde PLZ;Kunde Ort;Kunde Telefon;Kunde Email;Partner;Addon Lehrverrohrung Grundstück;Addon Hausverkabelung;BEP festgelegt;Starterpaket erhalten;Erstellt;Letzte Bearbeitung
+Kampagne;Netzgebiet ID;Netzgebiet;Extref;Bestellcode;OAID;Bestelltyp;Status;Anschlusstyp;GWR Adresscode;Meridian;RW;HW;Anschluss Strasse;Anschluss Hausnummer;Anschluss PLZ;Anschluss Ort;Anschluss Wohneinheit;GPS Breite;GPS Länge;Anzahl Anschlüsse;Kunde Firma;Kunde UID;Kunde Vorname;Kunde Nachname;Kunde Strasse;Kunde PLZ;Kunde Ort;Kunde Telefon;Kunde Email;Partner;Addon Lehrverrohrung Grundstück;Addon Hausverkabelung;BEP festgelegt;Starterpaket erhalten;Erstellt;Letzte Bearbeitung
 <?php
 $line = 0;
 
@@ -57,7 +57,7 @@ while($data = mysqli_fetch_object($res)):
   if($data->uid == "string") $data->uid = "";
   
 ?>
-"<?=$campaign->name?>";"<?=$netzgebiet->extref?>";"<?=$netzgebiet->name?>";"<?=$data->extref?>";"<?=$data->ucode?>";"<?=$wohneinheit->oaid?>";"<?=__($data->type,"preorder")?>";"<?=$status->name?>";"<?=__($data->connection_type,"preorder")?>";"<?=$hausnummer->adrcd?>";"<?=$hausnummer->rw?>";"<?=$hausnummer->hw?>";"<?=$strasse->name?>";"<?=$hausnummer->hausnummer?>";"<?=$plz->plz?>";"<?=$ortschaft->name?>";"<?=$unit_data?>";"<?=$hausnummer->gps_lat?>";"<?=$hausnummer->gps_long?>";<?=$data->connection_count?>;"<?=$data->company?>";"<?=$data->uid?>";"<?=$data->firstname?>";"<?=$data->lastname?>";"<?=$data->street?>";"<?=$data->zip?>";"<?=$data->city?>";"<?=$data->phone?>";"<?=$data->email?>";"<?=$partner->getCompanyOrName()?>";<?=$addon_property?>;<?=$addon_inhouse?>;<?=($bep) ? "1" : "0"?>;<?=($inhouse) ? "1" : "0"?>;"<?=date("Y-m-d H:i:s",$data->create)?>";"<?=date("Y-m-d H:i:s",$data->edit)?>"
+"<?=$campaign->name?>";"<?=$netzgebiet->extref?>";"<?=$netzgebiet->name?>";"<?=$data->extref?>";"<?=$data->ucode?>";"<?=$wohneinheit->oaid?>";"<?=__($data->type,"preorder")?>";"<?=$status->name?>";"<?=__($data->connection_type,"preorder")?>";"<?=$hausnummer->adrcd?>";"<?=$hausnummer->meridian?>";"<?=$hausnummer->rw?>";"<?=$hausnummer->hw?>";"<?=$strasse->name?>";"<?=$hausnummer->hausnummer?>";"<?=$plz->plz?>";"<?=$ortschaft->name?>";"<?=$unit_data?>";"<?=$hausnummer->gps_lat?>";"<?=$hausnummer->gps_long?>";<?=$data->connection_count?>;"<?=$data->company?>";"<?=$data->uid?>";"<?=$data->firstname?>";"<?=$data->lastname?>";"<?=$data->street?>";"<?=$data->zip?>";"<?=$data->city?>";"<?=$data->phone?>";"<?=$data->email?>";"<?=$partner->getCompanyOrName()?>";<?=$addon_property?>;<?=$addon_inhouse?>;<?=($bep) ? "1" : "0"?>;<?=($inhouse) ? "1" : "0"?>;"<?=date("Y-m-d H:i:s",$data->create)?>";"<?=date("Y-m-d H:i:s",$data->edit)?>"
 <?php
 $line++;
 if($line % 1000 === 0) {

application/AddressDB/AddressDB.php

@@ -27,6 +27,7 @@ class AddressDB {
     `Hausnummer`.`hausnummer` AS `hausnummer`,
     `Hausnummer`.`extref` AS `hausnummer_extref`,
     `Hausnummer`.`unit_count` AS `unit_count`,
+    `Hausnummer`.`meridian` AS `meridian`,
     `Hausnummer`.`rw` AS `rw`,
     `Hausnummer`.`hw` AS `hw`,
     `Hausnummer`.`gps_lat` AS `gps_lat`,

application/Api/v1/AddressdbApicontroller.php

@@ -441,6 +441,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
               'street' => $data->strasse,
               'housenumber' => $housenumber,
               'lot_number' => $data->grund_nr,
+              'meridian' => $data->meridian,
               'rw' => $data->rw,
               'hw' => $data->hw,
               'building_unit_count' => 0,
@@ -588,6 +589,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
                 }
                 $new_address['district'] = $ta['district'];
                 $new_address['lot_number'] = $ta['lot_number'];
+                $new_address['meridian'] = $ta['meridian'];
                 $new_address['rw'] = $ta['rw'];
                 $new_address['hw'] = $ta['hw'];
                 $new_address['building_unit_count'] = $ta['building_unit_count'];
@@ -713,6 +715,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
               'street' => $data->strasse,
               'housenumber' => $housenumber,
               'lot_number' => $data->grund_nr,
+              'meridian' => $data->meridian,
               'rw' => $data->rw,
               'hw' => $data->hw,
               'building_unit_count' => 0,
@@ -783,6 +786,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
               }
               $new_address['district'] = $ta['district'];
               $new_address['lot_number'] = $ta['lot_number'];
+              $new_address['meridian'] = $ta['meridian'];
               $new_address['rw'] = $ta['rw'];
               $new_address['hw'] = $ta['hw'];
               $new_address['building_unit_count'] = $ta['building_unit_count'];

public/docs/preorder-api.yaml

@@ -799,6 +799,10 @@ components:
           type: string
           description: Grundstücksnummer
           example: 123/7
+        meridian:
+          type: string
+          description: Meridian der Zugangskoordinate
+          example: "M31"
         rw:
           type: string
           description: Rechtswert der Zugangskoordinate
@@ -915,6 +919,10 @@ components:
           type: string
           description: Grundstücksnummer
           example: 123/7
+        meridian:
+          type: string
+          description: Meridian der Zugangskoordinate
+          example: "M31"
         rw:
           type: string
           description: Rechtswert der Zugangskoordinate

scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php

@@ -79,10 +79,9 @@ for($i = 0; $i < $batch_size; $i++) {
         "Content-type: application/json",
       ];
       $out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
-      $u++;
     }
     echo ".";
-
+    $u++;
   }
 }