updated rimotype map

application/Preorder/PreorderModel.php

@@ -1357,7 +1357,7 @@ ORDER BY
         $sql = "
         SELECT
             h.id AS hausnummer_id, h.gps_lat, h.gps_long, h.rimo_type, h.rimo_op_state, h.rimo_ex_state, h.hausnummer,
-            s.name AS strasse_name, plz.plz AS plz_name, o.name AS ortschaft_name,
+            s.name AS strasse_name, plz.plz AS plz_name, o.name AS ortschaft_name, h.rimo_id,
             COUNT(DISTINCT we.id) AS wohneinheit_count,
             COUNT(DISTINCT ps.id) AS preorder_count
         FROM `{$addressDbName}`.`Hausnummer` AS h
@@ -1379,4 +1379,38 @@ ORDER BY
         $result = $db->query($sql);
         return $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
     }
+
+    public static function getPreorderRimoFaultsData(int $campaignId): array {
+        $db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME);
+        $fronkDbName = defined('FRONKDB_DBNAME') ? FRONKDB_DBNAME : 'thetool';
+        $addressDbName = defined('ADDRESSDB_DBNAME') ? ADDRESSDB_DBNAME : 'addressdb';
+        $safeCampaignId = (int)$campaignId;
+
+        $sql = "
+SELECT
+    h.id AS hausnummer_id, h.rimo_id as extref, h.gps_lat, h.gps_long, h.rimo_type, 
+    h.rimo_op_state, h.rimo_ex_state, h.hausnummer,
+    s.name AS strasse_name, 
+    plz.plz AS plz_name, 
+    o.name AS ortschaft_name,
+    g.name as gemeinde_name,
+    COUNT(DISTINCT we.id) AS wohneinheit_count
+FROM `{$addressDbName}`.`Hausnummer` AS h
+LEFT JOIN `{$addressDbName}`.`Wohneinheit` AS we ON h.id = we.hausnummer_id
+LEFT JOIN `{$addressDbName}`.`Strasse` AS s ON h.strasse_id = s.id
+LEFT JOIN `{$addressDbName}`.`Gemeinde` AS g ON s.gemeinde_id = g.id
+LEFT JOIN `{$addressDbName}`.`Plz` AS plz ON h.plz_id = plz.id
+LEFT JOIN `{$addressDbName}`.`Ortschaft` AS o ON h.ortschaft_id = o.id
+WHERE h.netzgebiet_id = (
+        SELECT n.adb_netzgebiet_id FROM `{$fronkDbName}`.`Preordercampaign` pc
+        JOIN `{$fronkDbName}`.`Network` n ON pc.network_id = n.id
+        WHERE pc.id = {$safeCampaignId}
+    ) AND h.gps_lat IS NOT NULL AND h.gps_long IS NOT NULL
+GROUP BY h.id
+ORDER BY s.name, h.hausnummer
+";
+
+        $result = $db->query($sql);
+        return $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
+    }
 }