ZsgsDesign / NOJ

app/Admin/Controllers/ApiController.php

Spacing +9 added lines, -9 removed lines

@@ -10,20 +10,20 @@ 
 
 class ApiController extends AdminController
 {
-    protected function paginate($items, $perPage = 15)
+    protected function paginate($items, $perPage=15)
     {
-        $currentPage = Paginator::resolveCurrentPage();
-        $offSet = ($currentPage * $perPage) - $perPage;
-        $itemsForCurrentPage = array_slice($items, $offSet, $perPage, true);
-        $paginator = new LengthAwarePaginator($itemsForCurrentPage, count($items), $perPage, $currentPage, ['path' => Paginator::resolveCurrentPath()]);
+        $currentPage=Paginator::resolveCurrentPage();
+        $offSet=($currentPage * $perPage)-$perPage;
+        $itemsForCurrentPage=array_slice($items, $offSet, $perPage, true);
+        $paginator=new LengthAwarePaginator($itemsForCurrentPage, count($items), $perPage, $currentPage, ['path' => Paginator::resolveCurrentPath()]);
         return $paginator;
     }
 
     public function problems()
     {
-        $q = request()->q;
+        $q=request()->q;
 
-        return $this->paginate(Problem::like('pcode', $q)->orLike('title', $q)->orderBy('pcode', 'asc')->get()->values()->transform(function ($problem) {
+        return $this->paginate(Problem::like('pcode', $q)->orLike('title', $q)->orderBy('pcode', 'asc')->get()->values()->transform(function($problem) {
             return [
                 'id' => $problem->pid,
                 'text' => $problem->readable_name,
@@ -33,9 +33,9 @@ 
 
     public function users()
     {
-        $q = request()->q;
+        $q=request()->q;
 
-        return $this->paginate(User::like('name', $q)->orLike('email', $q)->orderBy('id', 'asc')->get()->values()->transform(function ($user) {
+        return $this->paginate(User::like('name', $q)->orLike('email', $q)->orderBy('id', 'asc')->get()->values()->transform(function($user) {
             return [
                 'id' => $user->id,
                 'text' => $user->readable_name,

app/Console/Commands/Scheduling/UpdateTrendingGroups.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $time=Carbon::now();
         $this->line("<fg=yellow>[$time] Processing:  </>Update Trending Groups");
 
-        $groupModel = new GroupModel();
+        $groupModel=new GroupModel();
         $groupModel->cacheTrendingGroups();
 
         $time=Carbon::now();

app/Models/Eloquent/Problem.php

Spacing +30 added lines, -30 removed lines

@@ -15,9 +15,9 @@ 
 {
     use LikeScope;
 
-    protected $table = 'problem';
-    protected $primaryKey = 'pid';
-    const UPDATED_AT = "update_date";
+    protected $table='problem';
+    protected $primaryKey='pid';
+    const UPDATED_AT="update_date";
 
     protected function serializeDate(DateTimeInterface $date)
     {
@@ -26,7 +26,7 @@ 
 
     public function getReadableNameAttribute()
     {
-        return $this->pcode . '. ' . $this->title;
+        return $this->pcode.'. '.$this->title;
     }
 
     public function submissions()
@@ -54,16 +54,16 @@ 
         return $this->getProblemStatus();
     }
 
-    public function getProblemStatus($userID = null, $contestID = null, Carbon $till = null)
+    public function getProblemStatus($userID=null, $contestID=null, Carbon $till=null)
     {
         if (blank($userID)) {
             if (Auth::guard('web')->check()) {
-                $userID = Auth::guard('web')->user()->id;
+                $userID=Auth::guard('web')->user()->id;
             }
         }
 
         if (filled($userID)) {
-            $probStatus = $this->getProblemStatusFromDB($userID, $contestID, $till);
+            $probStatus=$this->getProblemStatusFromDB($userID, $contestID, $till);
             if (blank($probStatus)) {
                 return [
                     "icon" => "checkbox-blank-circle-outline",
@@ -71,7 +71,7 @@ 
                 ];
             } else {
                 return [
-                    "icon" => $probStatus->verdict == "Accepted" ? "checkbox-blank-circle" : "cisco-webex",
+                    "icon" => $probStatus->verdict=="Accepted" ? "checkbox-blank-circle" : "cisco-webex",
                     "color" => $probStatus->color
                 ];
             }
@@ -83,13 +83,13 @@ 
         }
     }
 
-    private function getProblemStatusFromDB($userID, $contestID = null, Carbon $till = null)
+    private function getProblemStatusFromDB($userID, $contestID=null, Carbon $till=null)
     {
-        $endedAt = Carbon::now();
+        $endedAt=Carbon::now();
 
         if (filled($contestID)) {
             try {
-                $endedAt = Carbon::parse(Contest::findOrFail($contestID)->endedAt);
+                $endedAt=Carbon::parse(Contest::findOrFail($contestID)->endedAt);
             } catch (Exception $e) {
                 return null;
             }
@@ -97,41 +97,41 @@ 
 
         // Get the very first AC record
 
-        $acRecords = $this->submissions()->where([
+        $acRecords=$this->submissions()->where([
             'uid' => $userID,
             'cid' => $contestID,
             'verdict' => 'Accepted'
         ]);
         if (filled($contestID)) {
-            $acRecords = $acRecords->where("submission_date", "<", $endedAt->timestamp);
+            $acRecords=$acRecords->where("submission_date", "<", $endedAt->timestamp);
         }
         if (filled($till)) {
-            $acRecords = $acRecords->where("submission_date", "<", $till->timestamp);
+            $acRecords=$acRecords->where("submission_date", "<", $till->timestamp);
         }
-        $acRecords = $acRecords->orderBy('submission_date', 'desc')->first();
+        $acRecords=$acRecords->orderBy('submission_date', 'desc')->first();
         if (blank($acRecords)) {
-            $pacRecords = $this->submissions()->where([
+            $pacRecords=$this->submissions()->where([
                 'uid' => $userID,
                 'cid' => $contestID,
                 'verdict' => 'Partially Accepted'
             ]);
             if (filled($contestID)) {
-                $pacRecords = $pacRecords->where("submission_date", "<", $endedAt->timestamp);
+                $pacRecords=$pacRecords->where("submission_date", "<", $endedAt->timestamp);
             }
             if (filled($till)) {
-                $pacRecords = $pacRecords->where("submission_date", "<", $till->timestamp);
+                $pacRecords=$pacRecords->where("submission_date", "<", $till->timestamp);
             }
-            $pacRecords = $pacRecords->orderBy('submission_date', 'desc')->first();
+            $pacRecords=$pacRecords->orderBy('submission_date', 'desc')->first();
             if (blank($pacRecords)) {
-                $otherRecords = $this->submissions()->where([
+                $otherRecords=$this->submissions()->where([
                     'uid' => $userID,
                     'cid' => $contestID
                 ]);
                 if (filled($contestID)) {
-                    $otherRecords = $otherRecords->where("submission_date", "<", $endedAt->timestamp);
+                    $otherRecords=$otherRecords->where("submission_date", "<", $endedAt->timestamp);
                 }
                 if (filled($till)) {
-                    $otherRecords = $otherRecords->where("submission_date", "<", $till->timestamp);
+                    $otherRecords=$otherRecords->where("submission_date", "<", $till->timestamp);
                 }
                 return $otherRecords->orderBy('submission_date', 'desc')->first();
             }
@@ -141,27 +141,27 @@ 
         }
     }
 
-    public function users_latest_submission($users, $contestID = null, Carbon $till = null, $verdictFilter = [])
+    public function users_latest_submission($users, $contestID=null, Carbon $till=null, $verdictFilter=[])
     {
         if (filled($contestID)) {
-            $endedAt = Carbon::parse(Contest::findOrFail($contestID)->endedAt);
+            $endedAt=Carbon::parse(Contest::findOrFail($contestID)->endedAt);
         }
 
-        $lastRecordSubQuery = $this->submissions()->select('uid', DB::raw('MAX(submission_date) as submission_date'))->whereIntegerInRaw('uid', $users)->where('cid', $contestID)->groupBy('uid');
+        $lastRecordSubQuery=$this->submissions()->select('uid', DB::raw('MAX(submission_date) as submission_date'))->whereIntegerInRaw('uid', $users)->where('cid', $contestID)->groupBy('uid');
 
         if (filled($contestID)) {
-            $lastRecordSubQuery = $lastRecordSubQuery->where("submission_date", "<", $endedAt->timestamp);
+            $lastRecordSubQuery=$lastRecordSubQuery->where("submission_date", "<", $endedAt->timestamp);
         }
 
         if (filled($till)) {
-            $lastRecordSubQuery = $lastRecordSubQuery->where("submission_date", "<", $till->timestamp);
+            $lastRecordSubQuery=$lastRecordSubQuery->where("submission_date", "<", $till->timestamp);
         }
 
-        if(filled($verdictFilter)) {
-            $lastRecordSubQuery = $lastRecordSubQuery->whereIn('verdict', $verdictFilter);
+        if (filled($verdictFilter)) {
+            $lastRecordSubQuery=$lastRecordSubQuery->whereIn('verdict', $verdictFilter);
         }
 
-        $query = DB::table(DB::raw("({$lastRecordSubQuery->toSql()}) last_sub"))->leftJoinSub(Submission::toBase(), 'submissions', function ($join) {
+        $query=DB::table(DB::raw("({$lastRecordSubQuery->toSql()}) last_sub"))->leftJoinSub(Submission::toBase(), 'submissions', function($join) {
             $join->on('last_sub.submission_date', '=', 'submissions.submission_date')->on('last_sub.uid', '=', 'submissions.uid');
         })->select('sid', 'last_sub.submission_date as submission_date', 'last_sub.uid as uid', 'verdict', 'color')->orderBy('uid', 'ASC');
 

app/Models/Eloquent/Tool/SiteRank.php

Spacing +79 added lines, -79 removed lines

@@ -12,7 +12,7 @@ 
 
 class SiteRank
 {
-    private static $professionalRanking = [
+    private static $professionalRanking=[
         "Legendary Grandmaster" => "cm-colorful-text",
         "International Grandmaster" => "wemd-pink-text",
         "Grandmaster" => "wemd-red-text",
@@ -25,7 +25,7 @@ 
         "Newbie" => "wemd-gray-text",
     ];
 
-    private static $professionalRankingPer = [
+    private static $professionalRankingPer=[
         "Legendary Grandmaster" => 3000,
         "International Grandmaster" => 2600,
         "Grandmaster" => 2400,
@@ -38,7 +38,7 @@ 
         "Newbie" => 1,
     ];
 
-    private static $casualRanking = [
+    private static $casualRanking=[
         "Fleet Admiral" => "cm-colorful-text",
         "Admiral" => "wemd-pink-text",
         "Vice Admiral" => "wemd-red-text",
@@ -51,7 +51,7 @@ 
         "Recruit" => "wemd-gray-text",
     ];
 
-    private static $casualRankingPer = [
+    private static $casualRankingPer=[
         "Fleet Admiral" => 1,
         "Admiral" => 5,
         "Vice Admiral" => 10,
@@ -82,49 +82,49 @@ 
 
     public static function list($num)
     {
-        $rankList = Cache::tags(['rank'])->get('general');
-        if ($rankList == null) {
-            $rankList = [];
-        }
-        $rankList = collect($rankList)->slice(0, $num);
-        $userIDArr = $rankList->pluck('uid');
-        $userInfoRaw = User::whereIntegerInRaw('id', $userIDArr)->get();
-        $userInfo = [];
+        $rankList=Cache::tags(['rank'])->get('general');
+        if ($rankList==null) {
+            $rankList=[];
+        }
+        $rankList=collect($rankList)->slice(0, $num);
+        $userIDArr=$rankList->pluck('uid');
+        $userInfoRaw=User::whereIntegerInRaw('id', $userIDArr)->get();
+        $userInfo=[];
         foreach ($userInfoRaw as $u) {
-            $userInfo[$u->id] = $u;
+            $userInfo[$u->id]=$u;
         }
-        return $rankList->map(function ($item) use ($userInfo) {
-            $item["details"] = isset($userInfo[$item["uid"]]) ? $userInfo[$item["uid"]] : [];
+        return $rankList->map(function($item) use ($userInfo) {
+            $item["details"]=isset($userInfo[$item["uid"]]) ? $userInfo[$item["uid"]] : [];
             return $item;
         });
     }
 
-    private static function getRecords(Carbon $from = null)
+    private static function getRecords(Carbon $from=null)
     {
-        $userAcceptedRecords = Submission::select("uid", DB::raw("count(distinct pid) as solved"))->where("verdict", "Accepted");
-        $userCommunityRecords = ProblemSolution::select("uid", DB::raw("count(distinct pid) as community"))->where("audit", 1);
-        if(filled($from)){
-            $userAcceptedRecords = $userAcceptedRecords->where("submission_date", ">", $from->timestamp);
-            $userCommunityRecords = $userCommunityRecords->where("created_at", ">", $from);
-        }
-        $userAcceptedRecords = collect($userAcceptedRecords->groupBy("uid")->get()->toArray());
-        $userCommunityRecords = collect($userCommunityRecords->groupBy("uid")->get()->toArray());
-        $totUserRecords = $userAcceptedRecords->pluck('uid')->merge($userCommunityRecords->pluck('uid'))->unique();
-        $rankList = [];
-        foreach($totUserRecords as $uid) {
-            $rankList[$uid]['uid'] = $uid;
-            $rankList[$uid]['solved'] = 0;
-            $rankList[$uid]['community'] = 0;
-            $rankList[$uid]['tot'] = 0;
-        }
-        foreach($userAcceptedRecords as $userAcceptedRecord) {
-            $rankList[$userAcceptedRecord['uid']]['solved'] = $userAcceptedRecord['solved'];
-        }
-        foreach($userCommunityRecords as $userCommunityRecord) {
-            $rankList[$userCommunityRecord['uid']]['community'] = $userCommunityRecord['community'];
-        }
-        foreach($rankList as &$rankItem) {
-            $rankItem['tot'] = $rankItem['solved'] + $rankItem['community'];
+        $userAcceptedRecords=Submission::select("uid", DB::raw("count(distinct pid) as solved"))->where("verdict", "Accepted");
+        $userCommunityRecords=ProblemSolution::select("uid", DB::raw("count(distinct pid) as community"))->where("audit", 1);
+        if (filled($from)) {
+            $userAcceptedRecords=$userAcceptedRecords->where("submission_date", ">", $from->timestamp);
+            $userCommunityRecords=$userCommunityRecords->where("created_at", ">", $from);
+        }
+        $userAcceptedRecords=collect($userAcceptedRecords->groupBy("uid")->get()->toArray());
+        $userCommunityRecords=collect($userCommunityRecords->groupBy("uid")->get()->toArray());
+        $totUserRecords=$userAcceptedRecords->pluck('uid')->merge($userCommunityRecords->pluck('uid'))->unique();
+        $rankList=[];
+        foreach ($totUserRecords as $uid) {
+            $rankList[$uid]['uid']=$uid;
+            $rankList[$uid]['solved']=0;
+            $rankList[$uid]['community']=0;
+            $rankList[$uid]['tot']=0;
+        }
+        foreach ($userAcceptedRecords as $userAcceptedRecord) {
+            $rankList[$userAcceptedRecord['uid']]['solved']=$userAcceptedRecord['solved'];
+        }
+        foreach ($userCommunityRecords as $userCommunityRecord) {
+            $rankList[$userCommunityRecord['uid']]['community']=$userCommunityRecord['community'];
+        }
+        foreach ($rankList as &$rankItem) {
+            $rankItem['tot']=$rankItem['solved']+$rankItem['community'];
         }
         unset($rankItem);
         return $rankList;
@@ -132,19 +132,19 @@ 
 
     private static function parseCoefficient($rankList)
     {
-        $activityCoefficient = self::getRecords(Carbon::parse('-1 months'));
-        $activityCoefficientDivider = collect($activityCoefficient)->max('tot');
-        if(blank($activityCoefficientDivider)) {
-            $activityCoefficientDivider = 1;
+        $activityCoefficient=self::getRecords(Carbon::parse('-1 months'));
+        $activityCoefficientDivider=collect($activityCoefficient)->max('tot');
+        if (blank($activityCoefficientDivider)) {
+            $activityCoefficientDivider=1;
         }
         foreach ($rankList as $uid => $rankItem) {
-            if(isset($activityCoefficient[$uid])){
-                $activityTot = $activityCoefficient[$uid]['tot'];
+            if (isset($activityCoefficient[$uid])) {
+                $activityTot=$activityCoefficient[$uid]['tot'];
             } else {
-                $activityTot = 0;
+                $activityTot=0;
             }
-            $rankList[$uid]["activityCoefficient"] = ($activityTot / $activityCoefficientDivider) + 0.5;
-            $rankList[$uid]["points"] = $rankList[$uid]["tot"] * $rankList[$uid]["activityCoefficient"];
+            $rankList[$uid]["activityCoefficient"]=($activityTot / $activityCoefficientDivider)+0.5;
+            $rankList[$uid]["points"]=$rankList[$uid]["tot"] * $rankList[$uid]["activityCoefficient"];
         }
         usort($rankList, function($a, $b) {
             return $b['points'] <=> $a['points'];
@@ -155,25 +155,25 @@ 
     public static function rankList()
     {
         Cache::tags(['rank'])->flush();
-        $rankList = self::getRecords();
-        $totUsers = count($rankList);
-        if ($totUsers > 0) {
+        $rankList=self::getRecords();
+        $totUsers=count($rankList);
+        if ($totUsers>0) {
             // $rankList = DB::select("SELECT *,solvedCount+communityCount as totValue, 1 as activityCoefficient FROM (SELECT uid,sum(solvedCount) as solvedCount,sum(communityCount) as communityCount FROM ((SELECT uid,count(DISTINCT submission.pid) as solvedCount,0 as communityCount from submission where verdict=\"Accepted\" group by uid) UNION (SELECT uid,0 as solvedCount,count(DISTINCT pid) from problem_solution where audit=1 group by uid)) as temp GROUP BY uid) as temp2 ORDER BY solvedCount+communityCount DESC");
-            $rankList = self::parseCoefficient($rankList);
-            $rankIter = 1;
-            $rankValue = 1;
-            $rankSolved = -1;
-            $rankListCached = [];
+            $rankList=self::parseCoefficient($rankList);
+            $rankIter=1;
+            $rankValue=1;
+            $rankSolved=-1;
+            $rankListCached=[];
             self::procRankingPer($totUsers);
             foreach ($rankList as $rankItem) {
-                if ($rankSolved != $rankItem["points"]) {
-                    $rankValue = $rankIter;
-                    $rankSolved = $rankItem["points"];
+                if ($rankSolved!=$rankItem["points"]) {
+                    $rankValue=$rankIter;
+                    $rankSolved=$rankItem["points"];
                 }
-                $rankTitle = self::getRankTitle($rankValue);
+                $rankTitle=self::getRankTitle($rankValue);
                 Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400);
                 Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400);
-                $rankListCached[] = [
+                $rankListCached[]=[
                     "uid" => $rankItem["uid"],
                     "rank" => $rankValue,
                     "title" => $rankTitle,
@@ -190,14 +190,14 @@ 
 
     public static function getProfessionalRanking()
     {
-        $professionalRankList = [];
-        $verifiedUsers = User::all();
-        $rankIter = 0;
+        $professionalRankList=[];
+        $verifiedUsers=User::all();
+        $rankIter=0;
         foreach ($verifiedUsers as $user) {
-            $rankVal = $user->professional_rate;
-            $rankTitle = self::getProfessionalTitle($rankVal);
-            $titleColor = self::getProfessionalColor($rankTitle);
-            $professionalRankList[$rankIter++] = [
+            $rankVal=$user->professional_rate;
+            $rankTitle=self::getProfessionalTitle($rankVal);
+            $titleColor=self::getProfessionalColor($rankTitle);
+            $professionalRankList[$rankIter++]=[
                 "name" => $user->name,
                 "uid" => $user->id,
                 "avatar" => $user->avatar,
@@ -211,18 +211,18 @@ 
 
     private static function procRankingPer($totUsers)
     {
-        if ($totUsers > 0) {
-            $tot = 0;
-            $cur = 0;
+        if ($totUsers>0) {
+            $tot=0;
+            $cur=0;
             foreach (self::$casualRankingPer as $c) {
-                $tot += $c;
+                $tot+=$c;
             }
             foreach (self::$casualRankingPer as &$c) {
-                $c = round($c * $totUsers / $tot);
-                $cur += $c;
-                $c = $cur;
+                $c=round($c * $totUsers / $tot);
+                $cur+=$c;
+                $c=$cur;
             }
-            $c = $totUsers;
+            $c=$totUsers;
             unset($c);
         }
     }
@@ -230,7 +230,7 @@ 
     public static function getRankTitle($rankVal)
     {
         foreach (self::$casualRankingPer as $title => $c) {
-            if ($rankVal <= $c) {
+            if ($rankVal<=$c) {
                 return $title;
             }
         }
@@ -240,7 +240,7 @@ 
     public static function getProfessionalTitle($rankVal)
     {
         foreach (self::$professionalRankingPer as $title => $point) {
-            if ($rankVal >= $point) {
+            if ($rankVal>=$point) {
                 return $title;
             }
         }