ZsgsDesign / NOJ

app/Models/RankModel.php

Spacing +22 added lines, -22 removed lines

@@ -6,7 +6,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Arr;
-use Cache,Redis;
+use Cache, Redis;
 
 class RankModel extends Model
 {
@@ -64,26 +64,26 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if (is_null($rankTitle)) return "";
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if (is_null($rankTitle)) return self::$professionalRanking["None"];
         return self::$professionalRanking[$rankTitle];
     }
 
     public function list()
     {
         $rankList=Cache::tags(['rank'])->get('general');
-        $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all();
+        $userInfoRaw=DB::table("users")->select("id as uid", "avatar", "name")->get()->all();
         $userInfo=[];
-        foreach($userInfoRaw as $u){
+        foreach ($userInfoRaw as $u) {
             $userInfo[$u["uid"]]=$u;
         }
-        foreach($rankList as &$r){
-            $r["details"]=isset($userInfo[$r["uid"]])?$userInfo[$r["uid"]]:[];
+        foreach ($rankList as &$r) {
+            $r["details"]=isset($userInfo[$r["uid"]]) ? $userInfo[$r["uid"]] : [];
         }
         // var_dump($rankList); exit();
         return $rankList;
@@ -106,8 +106,8 @@ 
                     $rankSolved=$rankItem["totValue"];
                 }
                 $rankTitle=$this->getRankTitle($rankValue);
-                Cache::tags(['rank',$rankItem["uid"]])->put("rank", $rankValue, 86400);
-                Cache::tags(['rank',$rankItem["uid"]])->put("title", $rankTitle, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400);
                 $rankListCached[]=[
                     "uid"=>$rankItem["uid"],
                     "rank"=>$rankValue,
@@ -124,14 +124,14 @@ 
 
     private function getProfessionalRanking()
     {
-        $professionalRankList = [];
-        $verifiedUsers = DB::table("users")->select("professional_rate","id as uid","avatar","name")->get()->all();
-        $rankIter = 0;
-        foreach($verifiedUsers as $user) {
-            $rankVal = $user['professional_rate'];
-            $rankTitle = $this->getProfessionalTitle($rankVal);
-            $titleColor = self::getProfessionalColor($rankTitle);
-            $professionalRankList[$rankIter++] = [
+        $professionalRankList=[];
+        $verifiedUsers=DB::table("users")->select("professional_rate", "id as uid", "avatar", "name")->get()->all();
+        $rankIter=0;
+        foreach ($verifiedUsers as $user) {
+            $rankVal=$user['professional_rate'];
+            $rankTitle=$this->getProfessionalTitle($rankVal);
+            $titleColor=self::getProfessionalColor($rankTitle);
+            $professionalRankList[$rankIter++]=[
                 "name"=>$user["name"],
                 "uid"=>$user["uid"],
                 "avatar"=>$user["avatar"],
@@ -153,7 +153,7 @@ 
                 $tot+=$c;
             }
             foreach ($this->casualRankingPer as &$c) {
-                $c=round($c*$totUsers/$tot);
+                $c=round($c * $totUsers / $tot);
                 $cur+=$c;
                 $c=$cur;
             }
@@ -164,16 +164,16 @@ 
 
     private function getRankTitle($rankVal)
     {
-        foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+        foreach ($this->casualRankingPer as $title=>$c) {
+            if ($rankVal<=$c) return $title;
         }
         return Arr::last($this->casualRankingPer);
     }
 
     private function getProfessionalTitle($rankVal)
     {
-        foreach($this->professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+        foreach ($this->professionalRankingPer as $title=>$point) {
+            if ($rankVal>=$point) return $title;
         }
         return Arr::last($this->professionalRankingPer);
     }

Braces +12 added lines, -4 removed lines

@@ -64,13 +64,17 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if(is_null($rankTitle)) {
+            return "";
+        }
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if(is_null($rankTitle)) {
+            return self::$professionalRanking["None"];
+        }
         return self::$professionalRanking[$rankTitle];
     }
 
@@ -165,7 +169,9 @@ 
     private function getRankTitle($rankVal)
     {
         foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+            if($rankVal<=$c) {
+                return $title;
+            }
         }
         return Arr::last($this->casualRankingPer);
     }
@@ -173,7 +179,9 @@ 
     private function getProfessionalTitle($rankVal)
     {
         foreach($this->professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+            if($rankVal >= $point) {
+                return $title;
+            }
         }
         return Arr::last($this->professionalRankingPer);
     }