From 92b7dd3335a6572debeacfb5faa82c63a5e67888 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 8 Jun 2018 20:03:25 +0200
Subject: Some minor fixes

---
 .../account/src/Database/Models/Activity.php       | 166 ++++++++++-----------
 1 file changed, 83 insertions(+), 83 deletions(-)

(limited to 'main/app/sprinkles/account/src/Database/Models/Activity.php')

diff --git a/main/app/sprinkles/account/src/Database/Models/Activity.php b/main/app/sprinkles/account/src/Database/Models/Activity.php
index 4e5b609..8f6cd18 100644
--- a/main/app/sprinkles/account/src/Database/Models/Activity.php
+++ b/main/app/sprinkles/account/src/Database/Models/Activity.php
@@ -1,83 +1,83 @@
-<?php
-/**
- * UserFrosting (http://www.userfrosting.com)
- *
- * @link      https://github.com/userfrosting/UserFrosting
- * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
- */
-
-namespace UserFrosting\Sprinkle\Account\Database\Models;
-
-use Illuminate\Database\Capsule\Manager as Capsule;
-use UserFrosting\Sprinkle\Core\Database\Models\Model;
-
-/**
- * Activity Class
- *
- * Represents a single user activity at a specified point in time.
- * @author Alex Weissman (https://alexanderweissman.com)
- * @property string ip_address
- * @property int user_id
- * @property string type
- * @property datetime occurred_at
- * @property string description
- */
-class Activity extends Model
-{
-    /**
-     * @var string The name of the table for the current model.
-     */
-    protected $table = "activities";
-
-    protected $fillable = [
-        "ip_address",
-        "user_id",
-        "type",
-        "occurred_at",
-        "description"
-    ];
-
-    /**
-     * Joins the activity's user, so we can do things like sort, search, paginate, etc.
-     */
-    public function scopeJoinUser($query) {
-        $query = $query->select('activities.*');
-
-        $query = $query->leftJoin('users', 'activities.user_id', '=', 'users.id');
-
-        return $query;
-    }
-
-    /**
-     * Add clauses to select the most recent event of each type for each user, to the query.
-     *
-     * @return \Illuminate\Database\Query\Builder
-     */
-    public function scopeMostRecentEvents($query) {
-        return $query->select('user_id', 'event_type', Capsule::raw('MAX(occurred_at) as occurred_at'))
-            ->groupBy('user_id')
-            ->groupBy('type');
-    }
-
-    /**
-     * Add clauses to select the most recent event of a given type for each user, to the query.
-     *
-     * @param string $type The type of event, matching the `event_type` field in the user_event table.
-     * @return \Illuminate\Database\Query\Builder
-     */
-    public function scopeMostRecentEventsByType($query, $type) {
-        return $query->select('user_id', Capsule::raw('MAX(occurred_at) as occurred_at'))
-            ->where('type', $type)
-            ->groupBy('user_id');
-    }
-
-    /**
-     * Get the user associated with this activity.
-     */
-    public function user() {
-        /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
-        $classMapper = static::$ci->classMapper;
-
-        return $this->belongsTo($classMapper->getClassMapping('user'), 'user_id');
-    }
-}
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Account\Database\Models;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+use UserFrosting\Sprinkle\Core\Database\Models\Model;
+
+/**
+ * Activity Class
+ *
+ * Represents a single user activity at a specified point in time.
+ * @author Alex Weissman (https://alexanderweissman.com)
+ * @property string ip_address
+ * @property int user_id
+ * @property string type
+ * @property datetime occurred_at
+ * @property string description
+ */
+class Activity extends Model
+{
+    /**
+     * @var string The name of the table for the current model.
+     */
+    protected $table = "activities";
+
+    protected $fillable = [
+        "ip_address",
+        "user_id",
+        "type",
+        "occurred_at",
+        "description"
+    ];
+
+    /**
+     * Joins the activity's user, so we can do things like sort, search, paginate, etc.
+     */
+    public function scopeJoinUser($query) {
+        $query = $query->select('activities.*');
+
+        $query = $query->leftJoin('users', 'activities.user_id', '=', 'users.id');
+
+        return $query;
+    }
+
+    /**
+     * Add clauses to select the most recent event of each type for each user, to the query.
+     *
+     * @return \Illuminate\Database\Query\Builder
+     */
+    public function scopeMostRecentEvents($query) {
+        return $query->select('user_id', 'event_type', Capsule::raw('MAX(occurred_at) as occurred_at'))
+            ->groupBy('user_id')
+            ->groupBy('type');
+    }
+
+    /**
+     * Add clauses to select the most recent event of a given type for each user, to the query.
+     *
+     * @param string $type The type of event, matching the `event_type` field in the user_event table.
+     * @return \Illuminate\Database\Query\Builder
+     */
+    public function scopeMostRecentEventsByType($query, $type) {
+        return $query->select('user_id', Capsule::raw('MAX(occurred_at) as occurred_at'))
+            ->where('type', $type)
+            ->groupBy('user_id');
+    }
+
+    /**
+     * Get the user associated with this activity.
+     */
+    public function user() {
+        /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
+        $classMapper = static::$ci->classMapper;
+
+        return $this->belongsTo($classMapper->getClassMapping('user'), 'user_id');
+    }
+}
-- 
cgit v1.2.3