Skip to content

Commit 3709de6

Browse files
committed
FIxed the issues of count determining in the controller.
1 parent eb6ba90 commit 3709de6

File tree

1 file changed

+28
-20
lines changed

1 file changed

+28
-20
lines changed

src/Controller/ApiAnrRolfRisksController.php

+28-20
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Laminas\View\Model\JsonModel;
1111
use Monarc\FrontOffice\Service\AnrRolfRiskService;
12+
use Monarc\FrontOffice\Model\Entity\Measure;
1213

1314
/**
1415
* Api ANR Rolf Risks Controller
@@ -26,12 +27,11 @@ public function get($id)
2627
{
2728
$entity = $this->getService()->getEntity($id);
2829

29-
if (count($this->dependencies)) {
30-
$this->formatDependencies($entity, $this->dependencies, 'Monarc\FrontOffice\Model\Entity\Measure', ['referential']);
31-
}
30+
$this->formatDependencies($entity, $this->dependencies, Measure::class, ['referential']);
3231

3332
return new JsonModel($entity);
3433
}
34+
3535
/**
3636
* @inheritdoc
3737
*/
@@ -51,7 +51,9 @@ public function getList()
5151
foreach ($rolfRisks as $key => $rolfRisk) {
5252

5353
if (count($this->dependencies)) {
54-
$this->formatDependencies($rolfRisks[$key], $this->dependencies, 'Monarc\FrontOffice\Model\Entity\Measure', ['referential']);
54+
$this->formatDependencies(
55+
$rolfRisks[$key], $this->dependencies, 'Monarc\FrontOffice\Model\Entity\Measure', ['referential']
56+
);
5557
}
5658

5759
$rolfRisk['tags']->initialize();
@@ -64,40 +66,46 @@ public function getList()
6466

6567
return new JsonModel([
6668
'count' => $service->getFilteredSpecificCount($page, $limit, $order, $filter, $tag, $anr),
67-
$this->name => $rolfRisks
69+
$this->name => $rolfRisks,
6870
]);
6971
}
7072

7173
public function update($id, $data)
7274
{
73-
if(count($data['measures'])>0)
74-
$data['measures'] = $this->addAnrId($data['measures']);
75-
return parent::update($id, $data);
75+
if (!empty($data['measures'])) {
76+
$data['measures'] = $this->addAnrId($data['measures']);
77+
}
78+
79+
return parent::update($id, $data);
7680
}
7781

7882
public function patch($id, $data)
7983
{
80-
if(count($data['measures'])>0)
81-
$data['measures'] = $this->addAnrId($data['measures']);
82-
return parent::patch($id, $data);
84+
if (!empty($data['measures'])) {
85+
$data['measures'] = $this->addAnrId($data['measures']);
86+
}
87+
88+
return parent::patch($id, $data);
8389
}
8490

8591

8692
public function patchList($data)
8793
{
88-
$service = $this->getService();
89-
$data['toReferential'] = $this->addAnrId($data['toReferential']);
90-
$service->createLinkedRisks($data['fromReferential'],$data['toReferential']);
94+
$service = $this->getService();
95+
$data['toReferential'] = $this->addAnrId($data['toReferential']);
96+
$service->createLinkedRisks($data['fromReferential'], $data['toReferential']);
9197

92-
return new JsonModel([
93-
'status' => 'ok',
94-
]);
98+
return new JsonModel([
99+
'status' => 'ok',
100+
]);
95101
}
96102

97103
public function create($data)
98104
{
99-
if(count($data['measures'])>0)
100-
$data['measures'] = $this->addAnrId($data['measures']);
101-
return parent::create($data);
105+
if (!empty($data['measures'])) {
106+
$data['measures'] = $this->addAnrId($data['measures']);
107+
}
108+
109+
return parent::create($data);
102110
}
103111
}

0 commit comments

Comments
 (0)