Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
Fixed issue when PreorderApiUser has non-existent campaign linked

See merge request fronk/thetool!67
This commit is contained in:
Frank Schubert
2023-08-21 08:22:02 +00:00
parent 335abcd1cc 4df128362f
commit 5a6ee954bf
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/Api/v1/PreorderApicontroller.php
View File

@@ -37,7 +37,7 @@ class PreorderApicontroller extends mfBaseApicontroller {
foreach($campaignApiusers as $campaignApiuser) {
$campaign = new Preordercampaign($campaignApiuser->preordercampaign_id);
if($campaign) {
if($campaign->id) {
foreach(PreordercampaignSalesclusterModel::search(['preordercampaign_id' => $campaign->id]) as $campain_scluster) {
if(!in_array($campain_scluster->salescluster_id, $this->filter_salescluster_ids)) {
$this->filter_salescluster_ids[] = $campain_scluster->salescluster_id;
@@ -70,7 +70,9 @@ class PreorderApicontroller extends mfBaseApicontroller {
if($campaign->allow_unit_update == 1) {
$this->allow_unit_update = true;
}
} else {
$this->log->debug(__METHOD__.": campaign not found (PreordercampaignApiuser::preordercampaign_id ".$campaignApiuser->preordercampaign_id.")");
$this->log->debug(print_r($campaignApiuser, true));
}
@@ -555,6 +557,17 @@ class PreorderApicontroller extends mfBaseApicontroller {
$campaign_id = $this->campaigns_by_scluster[$address->netzgebiet_id];
$this->campaign = new Preordercampaign($campaign_id);
if(!$this->campaign->id) {
$this->log->debug("=================================================================");
$this->log->debug(__METHOD__.": Campaign not found");
$this->log->debug(print_r($address, true));
$this->log->debug(print_r($this->campaigns_by_scluster, true));
$this->log->debug("campaign id: $campaign_id");
$this->log->debug(print_r($this->campaign, true));
$this->log->debug("=================================================================");
return mfResponse::InternalServerError(['message' => "Ein Interner Fehler ist aufgetreten"]);
}
if($this->campaign->from > date('U') || $this->campaign->to < date('U')) {
return mfResponse::Forbidden(['message' => "Bestellung in diesem Netzgebiet/Cluster nicht erlaubt"]);
}