diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php index 0936f9b5b..dae4dd884 100644 --- a/application/Api/v1/AddressdbApicontroller.php +++ b/application/Api/v1/AddressdbApicontroller.php @@ -366,6 +366,8 @@ class AddressdbApicontroller extends mfBaseApicontroller { return mfResponse::BadRequest(['message' => "Search string cannot be empty"]); } + $stati = ADBStatusModel::getAll(true); + /* * do normal search */ @@ -448,6 +450,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { 'sort_key' => $sort_key, 'oaid' => $data->hausnummer_oaid, 'cluster_id' => $data->netzgebiet_extref, + 'status' => [], 'rimo_external_id' => null, 'visibility' => null, 'adrcd' => null, @@ -478,11 +481,27 @@ class AddressdbApicontroller extends mfBaseApicontroller { unset($tmp_addresses[$address_key]['municipality']); } if($this->me->is("preorderaddressreporting")) { + $sflags = []; + foreach(ADBStatusflagModel::getAll() as $sflag) { + $sflag->hausnummer_id = $data->hausnummer_id; + $sflags[] = [ + "code" => (int)$sflag->code, + "text" => $sflag->name, + "value" => ($sflag->value->value) ? true : false, + ]; + } + $status = [ + "code" => $stati[$data->status_id]->code, + "text" => $stati[$data->status_id]->name, + "flags" => $sflags, + ]; + $tmp_addresses[$address_key]['status'] = $status; $tmp_addresses[$address_key]['rimo_external_id'] = $data->hausnummer_rimo_id; $tmp_addresses[$address_key]['visibility'] = $data->visibility; $tmp_addresses[$address_key]['adrcd'] = $data->adrcd; $tmp_addresses[$address_key]['subcd'] = $data->subcd; } else { + unset($tmp_addresses[$address_key]['status']); unset($tmp_addresses[$address_key]['rimo_external_id']); unset($tmp_addresses[$address_key]["visibility"]); unset($tmp_addresses[$address_key]["adrcd"]); @@ -605,6 +624,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { $new_address['ordered'] = $u['ordered']; $new_address['orderType'] = $u['orderType']; $new_address['ispName'] = $u['ispName']; + $new_address['status'] = $ta['status']; $new_address['rimo_external_id'] = $ta['rimo_external_id']; $new_address['visibility'] = $ta['visibility']; $new_address['adrcd'] = $ta['adrcd']; @@ -862,6 +882,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { $new_address['ordered'] = $u['ordered']; $new_address['orderType'] = $u['orderType']; $new_address['ispName'] = $u['ispName']; + $new_address['status'] = $ta['status']; $new_address['rimo_external_id'] = $ta['rimo_external_id']; $new_address['visibility'] = $ta['visibility']; $new_address['adrcd'] = $ta['adrcd'];