Changeset 3c89e27 for app/Http/Controllers/CrimeCaseController.php

Timestamp:

08/26/24 16:17:04 (3 months ago)

Author:

bube-ristovska <ristovska725@…>

Branches:

main

Parents:

5372778

Message:

Refactored duplicate code

File:

• app/Http/Controllers/CrimeCaseController.php (modified) (7 diffs)

app/Http/Controllers/CrimeCaseController.php

@@ -9 +9 @@
 class CrimeCaseController extends Controller
 {
+    private function policeStationIsPoliceman()
+    {
+        return DB::table('police_station')
+            ->where('p_id', Session::get('p_id'))
+            ->get();
+    }
+    private function policeStationIsOfficer()
+    {
+        return DB::table('police_station')
+            ->where('pe_id', Session::get('pe_id'))
+            ->get();
+    }
     function cases(){
         if(Session::get('pe_id') == null) {
@@ -14 +26 @@
         }
 
-
         if(Session::get('is_policeman')){
-            $police_station = DB::select('select * from police_station where p_id=:p_id;',['p_id'=>  Session::get('p_id')]);
+            $police_station = $this->policeStationIsPoliceman();
         } else {
-            $police_station = DB::select('select * from police_station where pe_id=:pe_id;',['pe_id'=>  Session::get('pe_id')]);
+            $police_station = $this->policeStationIsOfficer();
         }
 
-        $cases = DB::select('select * from crime_case where p_id=:p_id;',['p_id'=> $police_station[0]->p_id]);
-
+        $cases = DB::table('crime_case')
+            ->where('p_id', $police_station[0]->p_id)
+            ->get();
 
         return view('cases', [
@@ -44 +56 @@
             'incident_place'=>'required'
         ]);
-        $statement["statement_date"] = Carbon::now()->format('Y-m-d');
-        $covek = DB::select('select pe_id from people where embg=:embg;',['embg'=> $statement["embg"]]);
+         $statement["statement_date"] = Carbon::now()->format('Y-m-d');
+         $covek = DB::select('select pe_id from people where embg=:embg;',['embg'=> $statement["embg"]]);
          $s_id_b = DB::select('select MAX(s_id) from statements');
          $s_id = $s_id_b[0]->max;
-        $s_id = $s_id +1 ;
-        $policaec =  DB::select('select pe_id from policeman where badge_no=:badge_no;',['badge_no'=> Session::get("badge_no")]);
+         $s_id = $s_id +1 ;
+         $policaec =  DB::select('select pe_id from policeman where badge_no=:badge_no;',['badge_no'=> Session::get("badge_no")]);
 
         if ($role === 'witness') {
@@ -84 +96 @@
     }
     function finished_cases(){
-
         if(Session::get('is_policeman')){
-            $police_station = DB::select('select * from police_station where p_id=:p_id;',['p_id'=>  Session::get('p_id')]);
+            $police_station = $this->policeStationIsPoliceman();
         } else {
-            $police_station = DB::select('select * from police_station where pe_id=:pe_id;',['pe_id'=>  Session::get('pe_id')]);
+            $police_station = $this->policeStationIsOfficer();
         }
 
-        $cases = DB::select('select * from crime_case where p_id=:p_id and c_status=\'Z\';', ['p_id' => $police_station[0]->p_id]);
-
+        $cases = DB::table('crime_case')
+            ->where('p_id', $police_station[0]->p_id)
+            ->where('c_status', 'Z')
+            ->get();
         return view('archive', [
             'cases' => $cases,
@@ -100 +113 @@
     function case($wildcard){
         Session::put('c_id', $wildcard);
-        $case = DB::select('select * from crime_case where c_id=:c_id;',['c_id'=> $wildcard]);
-        $p_address = DB::select('select p_address from police_station where p_id=:p_id;',['p_id'=> $case[0]->p_id]);
-        $statements = DB::select('select * from statements where c_id=:c_id;',['c_id'=> $wildcard]);
-
+        $case = DB::table('crime_case')
+            ->where('c_id', $wildcard)
+            ->get();
+        $p_address = DB::table('police_station')
+            ->where('p_id', $case[0]->p_id)
+            ->value('p_address');
+        $statements = DB::table('statements')
+            ->where('c_id', $wildcard)
+            ->get();
 
         $victims=[];
@@ -110 +128 @@
         $evidence = [];
         foreach ($statements as $statement) {
-            $evidence_id = DB::select('select * from mentions_evidence where s_id=:s_id;',['s_id'=> $statement->s_id]);
-            if (!empty($evidence_id)) { // Check if $evidence_id is not empty
-                $evidence_id[] = $evidence_id[0];
-            }
+            $evidence_id = DB::table('mentions_evidence')
+                ->where('s_id', $statement->s_id)
+                ->get();
+//            if (!empty($evidence_id)) { // Check if $evidence_id is not empty
+//                $evidence_id[] = $evidence_id[0];
+//            }
         }
          $evidence_id=collect($evidence_id)->unique();
         foreach ($evidence_id as $e) {
-            $evidence = DB::select('select * from evidence where e_id=:e_id;',['e_id'=> $e->e_id]);
-            $evidence[] = $evidence[0];
+            $evidence = DB::table('evidence')
+                ->where('e_id', $e->e_id)->get();
+
         }
         foreach ($statements as $st){
             if (!($st->victim_pe_id)==NULL){
-                $victim=DB::select('select * from people where pe_id=:pe_id;',['pe_id'=> $st->victim_pe_id]);
+                $victim = DB::table('people')
+                    ->where('pe_id', $st->victim_pe_id)->get();
                 $victims[] = $victim[0];
             }
@@ -128 +150 @@
         foreach ($statements as $st){
             if (!($st->witness_pe_id)==NULL) {
-                $witnes = DB::select('select * from people where pe_id=:pe_id;', ['pe_id' => $st->witness_pe_id]);
+                $witnes = DB::table('people')
+                    ->where('pe_id', $st->witness_pe_id)->get();
                 $witness[] = $witnes[0];
             }
         }
 
-
         return view('case', [
             'case' => $case[0],
-            'p_address'=>$p_address[0]->p_address,
+            'p_address'=>$p_address,
             'statements'=>$statements,
             'evidence'=>$evidence,