Merge pull request #32 from monarc-project/bugfix/261

Bugfix/261 Changed the recommendation sorting way.
monarc-project · Apr 14, 2020 · 329104b · 329104b
2 parents 26ed932 + f0733c9
commit 329104b
Show file tree

Hide file tree

Showing 17 changed files with 424 additions and 230 deletions.
diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php
@@ -49,7 +49,7 @@ public function create($data)
             ]);
         }
 
-        $this->getResponse()->setStatusCode(405);
+        $this->getResponse()->setStatusCode(401);
 
         return new JsonModel([]);
     }

diff --git a/src/Model/Entity/AbstractEntity.php b/src/Model/Entity/AbstractEntity.php
@@ -215,7 +215,9 @@ public function exchangeArray(array $options, $partial = false)
         if (!$this->squeezeAutoPositionning && isset($this->parameters['implicitPosition']['field'])) {
             $parent_before = $this->get($this->parameters['implicitPosition']['field']);
             if (is_object($parent_before)) {
-                $parent_before = !is_null($parent_before->get('uuid'))?$parent_before->get('uuid')->toString():$parent_before->get('id');
+                $parent_before = $parent_before->get('uuid') !== null
+                    ? (string)$parent_before->get('uuid')
+                    : $parent_before->get('id');
             }
             $parent_after = array_key_exists($this->parameters['implicitPosition']['field'], $options) ? $options[$this->parameters['implicitPosition']['field']] : null;
 
@@ -305,11 +307,11 @@ private function calculatePosition($mode = self::IMP_POS_END, $previous = null,
                 $prec_parent_id = null;
 
                 if ($isParentable) {
-                    $identifiers = is_null($prec->get($this->parameters['implicitPosition']['field'])) ? [] : $this->getDbAdapter()->getClassMetadata(ClassUtils::getRealClass(get_class($prec->get($this->parameters['implicitPosition']['field']))))->getIdentifierFieldNames();
+                    $identifiers = $prec->get($this->parameters['implicitPosition']['field']) === null ? [] : $this->getDbAdapter()->getClassMetadata(ClassUtils::getRealClass(get_class($prec->get($this->parameters['implicitPosition']['field']))))->getIdentifierFieldNames();
                     if (in_array('uuid', $identifiers)) {
-                        $prec_parent_id = is_null($prec->get($this->parameters['implicitPosition']['field'])) ? null : $prec->get($this->parameters['implicitPosition']['field'])->getUuid()->toString();
+                        $prec_parent_id = $prec->get($this->parameters['implicitPosition']['field']) === null ? null : (string)$prec->get($this->parameters['implicitPosition']['field'])->getUuid();
                     } else {
-                        $prec_parent_id = is_null($prec->get($this->parameters['implicitPosition']['field'])) ? null : $prec->get($this->parameters['implicitPosition']['field'])->get('id');
+                        $prec_parent_id = $prec->get($this->parameters['implicitPosition']['field']) === null ? null : $prec->get($this->parameters['implicitPosition']['field'])->get('id');
                     }
                 }
                 $parent_after_id = (is_array($parent_after)&&array_key_exists('uuid', $parent_after))?$parent_after['uuid']:$parent_after;

diff --git a/src/Model/Entity/AmvSuperClass.php b/src/Model/Entity/AmvSuperClass.php
@@ -124,15 +124,15 @@ public function setUuid($id)
     }
 
     /**
-     * @return Anr
+     * @return AnrSuperClass
      */
     public function getAnr()
     {
         return $this->anr;
     }
 
     /**
-     * @param Anr $anr
+     * @param AnrSuperClass $anr
      */
     public function setAnr($anr)
     {
@@ -183,7 +183,7 @@ public function getVulnerability()
     }
 
     /**
-     * @param Vulnerability $vulnerability
+     * @param VulnerabilitySuperClass $vulnerability
      */
     public function setVulnerability($vulnerability)
     {

diff --git a/src/Model/Entity/AnrSuperClass.php b/src/Model/Entity/AnrSuperClass.php
@@ -135,77 +135,77 @@ class AnrSuperClass extends AbstractEntity
      *
      * @ORM\Column(name="init_anr_context", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $initAnrContext = '0';
+    protected $initAnrContext = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="init_eval_context", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $initEvalContext = '0';
+    protected $initEvalContext = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="init_risk_context", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $initRiskContext = '0';
+    protected $initRiskContext = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="init_def_context", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $initDefContext = '0';
+    protected $initDefContext = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="init_livrable_done", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $initLivrableDone = '0';
+    protected $initLivrableDone = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="model_summary", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $modelSummary = '0';
+    protected $modelSummary = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="model_livrable_done", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $modelLivrableDone = '0';
+    protected $modelLivrableDone = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="eval_risks", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $evalRisks = '0';
+    protected $evalRisks = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="eval_plan_risks", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $evalPlanRisks = '0';
+    protected $evalPlanRisks = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="eval_livrable_done", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $evalLivrableDone = '0';
+    protected $evalLivrableDone = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="manage_risks", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $manageRisks = '0';
+    protected $manageRisks = 0;
 
 
     /**
@@ -241,14 +241,14 @@ class AnrSuperClass extends AbstractEntity
      *
      * @ORM\Column(name="cache_model_show_rolf_brut", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $cacheModelShowRolfBrut = '0';
+    protected $cacheModelShowRolfBrut = 0;
 
     /**
      * @var int
      *
      * @ORM\Column(name="show_rolf_brut", type="smallint", options={"unsigned":true, "default":0})
      */
-    protected $showRolfBrut = '0';
+    protected $showRolfBrut = 0;
 
     public function getId(): int
     {
@@ -281,4 +281,14 @@ public function setObjects($objects): self
 
         return $this;
     }
+
+    public function getSeuilRolf1(): int
+    {
+        return $this->seuilRolf1;
+    }
+
+    public function getSeuilRolf2(): int
+    {
+        return $this->seuilRolf2;
+    }
 }