Merge pull request #20 from hamid-project/feature/19_adjust_potential_condition

condition adjustment. (#19)

Author: elf

app/Internship.php

@@ -73,11 +73,20 @@ public static function getByPotentials(array $potentials)
 
     public static function getQueryByPotentials(array $potentials)
     {
-        $q = self::query()
-           ->whereJsonContains('potentials->area_cores', $potentials['area_codes'])
-           ->whereJsonContains('potentials->specialisation_codes', $potentials['specialisation_codes'], 'OR')
-           ->whereJsonContains('potentials->transportation_codes', $potentials['transportation_codes'], 'OR')
-            ;
+        $q = self::query();
+
+        if ($potentials['area_codes']) {
+            $q->whereJsonContains('potentials->area_cores', $potentials['area_codes'], 'OR');
+        }
+
+        if ($potentials['specialisation_codes']) {
+            $q->whereJsonContains('potentials->specialisation_codes', $potentials['specialisation_codes'], 'OR');
+        }
+
+        if ($potentials['transportation_codes']) {
+            $q->whereJsonContains('potentials->transportation_codes', $potentials['transportation_codes'], 'OR');
+        }
+
         return $q;
     }
 }

app/Student.php

@@ -64,11 +64,20 @@ public static function getByPotentials(array $potentials)
 
     public static function getQueryByPotentials(array $potentials)
     {
-        $q = self::query()
-           ->whereJsonContains('potentials->area_cores', $potentials['area_codes'])
-           ->whereJsonContains('potentials->specialisation_codes', $potentials['specialisation_codes'], 'OR')
-           ->whereJsonContains('potentials->transportation_codes', $potentials['transportation_codes'], 'OR')
-            ;
+        $q = self::query();
+
+        if ($potentials['area_codes']) {
+            $q->whereJsonContains('potentials->area_cores', $potentials['area_codes'], 'OR');
+        }
+
+        if ($potentials['specialisation_codes']) {
+            $q->whereJsonContains('potentials->specialisation_codes', $potentials['specialisation_codes'], 'OR');
+        }
+
+        if ($potentials['transportation_codes']) {
+            $q->whereJsonContains('potentials->transportation_codes', $potentials['transportation_codes'], 'OR');
+        }
+
         return $q;
     }