From a012ea9e7d5dd0baadb549e1460a8339224f37a5 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 14 May 2015 11:18:12 +0200
Subject: Own Model class; new namespaces Database and Controllers; RFC2822
 dates

---
 src/CamilStaps/BotleaguesApi/Bot.php               | 11 ----
 src/CamilStaps/BotleaguesApi/Competition.php       | 12 ----
 src/CamilStaps/BotleaguesApi/CompetitionType.php   | 13 ----
 src/CamilStaps/BotleaguesApi/Database/Bot.php      |  9 +++
 .../BotleaguesApi/Database/Competition.php         | 10 +++
 .../BotleaguesApi/Database/CompetitionType.php     | 11 ++++
 src/CamilStaps/BotleaguesApi/Database/Game.php     |  9 +++
 src/CamilStaps/BotleaguesApi/Database/Model.php    | 30 +++++++++
 .../BotleaguesApi/Database/Participant.php         | 10 +++
 .../BotleaguesApi/Database/PasswordReminder.php    | 38 +++++++++++
 src/CamilStaps/BotleaguesApi/Database/User.php     | 75 +++++++++++++++++++++
 .../BotleaguesApi/Database/UserToken.php           | 24 +++++++
 src/CamilStaps/BotleaguesApi/Game.php              | 11 ----
 src/CamilStaps/BotleaguesApi/Participant.php       | 12 ----
 src/CamilStaps/BotleaguesApi/PasswordReminder.php  | 40 ------------
 src/CamilStaps/BotleaguesApi/User.php              | 76 ----------------------
 src/CamilStaps/BotleaguesApi/UserToken.php         | 21 ------
 17 files changed, 216 insertions(+), 196 deletions(-)
 delete mode 100644 src/CamilStaps/BotleaguesApi/Bot.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/Competition.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/CompetitionType.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/Bot.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/Competition.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/CompetitionType.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/Game.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/Model.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/Participant.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/User.php
 create mode 100644 src/CamilStaps/BotleaguesApi/Database/UserToken.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/Game.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/Participant.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/PasswordReminder.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/User.php
 delete mode 100644 src/CamilStaps/BotleaguesApi/UserToken.php

(limited to 'src/CamilStaps/BotleaguesApi')

diff --git a/src/CamilStaps/BotleaguesApi/Bot.php b/src/CamilStaps/BotleaguesApi/Bot.php
deleted file mode 100644
index 04fa2c7..0000000
--- a/src/CamilStaps/BotleaguesApi/Bot.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Bot extends Model {
-	
-    protected $table = 'bots';
-    protected $fillable = ['userId', 'gameId', 'title'];
-	
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Competition.php b/src/CamilStaps/BotleaguesApi/Competition.php
deleted file mode 100644
index a8da665..0000000
--- a/src/CamilStaps/BotleaguesApi/Competition.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Competition extends Model {
-    
-    protected $table = 'competitions';
-    protected $hidden = [];
-    protected $fillable = ['gameId', 'title', 'description', 'competition_type', 'start', 'end', 'max_players'];
-
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/CompetitionType.php b/src/CamilStaps/BotleaguesApi/CompetitionType.php
deleted file mode 100644
index b9fb426..0000000
--- a/src/CamilStaps/BotleaguesApi/CompetitionType.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
-
-class CompetitionType extends Model {
-    
-    protected $table = 'competition_types';
-    protected $primaryKey = 'type';
-    protected $hidden = [];
-    protected $fillable = ['description', 'explanation'];
-
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/Bot.php b/src/CamilStaps/BotleaguesApi/Database/Bot.php
new file mode 100644
index 0000000..f0be0fc
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/Bot.php
@@ -0,0 +1,9 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+class Bot extends Model {
+	
+    protected $table = 'bots';
+    protected $fillable = ['userId', 'gameId', 'title'];
+	
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/Competition.php b/src/CamilStaps/BotleaguesApi/Database/Competition.php
new file mode 100644
index 0000000..c355c08
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/Competition.php
@@ -0,0 +1,10 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+class Competition extends Model {
+    
+    protected $table = 'competitions';
+    protected $hidden = [];
+    protected $fillable = ['gameId', 'title', 'description', 'competition_type', 'start', 'end', 'max_players'];
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/CompetitionType.php b/src/CamilStaps/BotleaguesApi/Database/CompetitionType.php
new file mode 100644
index 0000000..0107ffe
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/CompetitionType.php
@@ -0,0 +1,11 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+class CompetitionType extends Model {
+    
+    protected $table = 'competition_types';
+    protected $primaryKey = 'type';
+    protected $hidden = [];
+    protected $fillable = ['description', 'explanation'];
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/Game.php b/src/CamilStaps/BotleaguesApi/Database/Game.php
new file mode 100644
index 0000000..a8b0649
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/Game.php
@@ -0,0 +1,9 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+class Game extends Model {
+    
+    protected $table = 'games';
+    protected $fillable = ['title'];
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/Model.php b/src/CamilStaps/BotleaguesApi/Database/Model.php
new file mode 100644
index 0000000..27bd1fc
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/Model.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: camilstaps
+ * Date: 14-5-15
+ * Time: 10:47
+ */
+
+namespace CamilStaps\BotleaguesApi\Database;
+
+use Carbon\Carbon;
+
+
+class Model extends \Illuminate\Database\Eloquent\Model {
+
+    protected $date_format = Carbon::RFC2822;
+
+    protected function formatDate($date) {
+        return Carbon::parse($date)->format($this->date_format);
+    }
+
+    public function getCreatedAtAttribute($attr) {
+        return $this->formatDate($attr);
+    }
+
+    public function getUpdatedAtAttribute($attr) {
+        return $this->formatDate($attr);
+    }
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/Participant.php b/src/CamilStaps/BotleaguesApi/Database/Participant.php
new file mode 100644
index 0000000..584d00c
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/Participant.php
@@ -0,0 +1,10 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+class Participant extends Model {
+    
+    protected $table = 'competition_types';
+    protected $hidden = [];
+    protected $fillable = ['botId', 'competitionId'];
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
new file mode 100644
index 0000000..40bc578
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: camilstaps
+ * Date: 13-5-15
+ * Time: 13:12
+ */
+
+namespace CamilStaps\BotleaguesApi\Database;
+
+use Illuminate\Support\Facades\Mail;
+
+class PasswordReminder extends Model {
+
+    protected $table = 'password_reminders';
+    protected $hidden = ['token'];
+    protected $fillable = ['userId', 'token', 'valid_till'];
+
+    /**
+     * Override the parent's save() function to automatically update the valid_till timestamp, and send an email
+     */
+    public function save(array $options = array()) {
+        $this->valid_till = date("Y-m-d H:i:s", time() + 3600);
+
+        $user = User::find($this->userId);
+        Mail::send('packages.camil-staps.botleagues-api.emails.auth.reminder', ['token' => $this->token], function($message) use ($user) {
+            $message->to($user->email, "User " . $user->id);
+        });
+
+        return parent::save($options);
+    }
+
+    /**
+     * Disable updated_at timestamp
+     */
+    public function setUpdatedAtAttribute($value) {}
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/User.php b/src/CamilStaps/BotleaguesApi/Database/User.php
new file mode 100644
index 0000000..383cc38
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/User.php
@@ -0,0 +1,75 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+use Illuminate\Auth\Reminders\RemindableInterface;
+use Illuminate\Auth\UserInterface;
+
+class User extends Model implements UserInterface, RemindableInterface {
+	
+    protected $table = 'users';
+	protected $hidden = ['password', 'remember_token', 'api_key'];
+    protected $fillable = ['email', 'password'];
+
+    public function isAdministrator() {
+        return (bool) $this->isAdministrator;
+    }
+
+    public function validToken($token) {
+        return UserToken::where('userId', $this->id)->where('token', $token)->where('valid_till', '>', date("Y-m-d H:i:s"))->count() > 0;
+    }
+
+    /**
+     * Get the unique identifier for the user.
+     *
+     * @return mixed
+     */
+    public function getAuthIdentifier() {
+        return $this->getKey();
+    }
+
+    /**
+     * Get the password for the user.
+     * @todo not implemented yet
+     * @return string
+     */
+    public function getAuthPassword() {
+        return $this->password;
+    }
+
+    /**
+     * Get the token value for the "remember me" session.
+     * @todo not implemented yet
+     * @return string
+     */
+    public function getRememberToken() {
+        return null;
+    }
+
+    /**
+     * Set the token value for the "remember me" session.
+     * @todo not implemented yet
+     * @param  string $value
+     * @return void
+     */
+    public function setRememberToken($value) {
+        return null;
+    }
+
+    /**
+     * Get the column name for the "remember me" token.
+     * @todo not implemented yet
+     * @return string
+     */
+    public function getRememberTokenName() {
+        return null;
+    }
+
+    /**
+     * Get the e-mail address where password reminders are sent.
+     *
+     * @return string
+     */
+    public function getReminderEmail() {
+        return $this->email;
+    }
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Database/UserToken.php b/src/CamilStaps/BotleaguesApi/Database/UserToken.php
new file mode 100644
index 0000000..92b03b8
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/UserToken.php
@@ -0,0 +1,24 @@
+<?php
+namespace CamilStaps\BotleaguesApi\Database;
+
+class UserToken extends Model {
+    
+    protected $table = 'user_tokens';
+    protected $hidden = ['token'];
+    protected $fillable = ['userId', 'token', 'valid_till'];
+    protected $dates = ['created_at', 'updated_at', 'valid_till'];
+
+    /**
+     * Override the parent's save() function to automatically update the valid_till timestamp
+     */
+    public function save(array $options = array()) {
+        $this->valid_till = date("Y-m-d H:i:s", time() + 3600);
+
+        return parent::save($options);
+    }
+
+    public function getValidTillAttribute($attr) {
+        return $this->formatDate($attr);
+    }
+
+}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Game.php b/src/CamilStaps/BotleaguesApi/Game.php
deleted file mode 100644
index 3823ab2..0000000
--- a/src/CamilStaps/BotleaguesApi/Game.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Game extends Model {
-    
-    protected $table = 'games';
-    protected $fillable = ['title'];
-
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Participant.php b/src/CamilStaps/BotleaguesApi/Participant.php
deleted file mode 100644
index 65e1261..0000000
--- a/src/CamilStaps/BotleaguesApi/Participant.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Participant extends Model {
-    
-    protected $table = 'competition_types';
-    protected $hidden = [];
-    protected $fillable = ['botId', 'competitionId'];
-
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/PasswordReminder.php b/src/CamilStaps/BotleaguesApi/PasswordReminder.php
deleted file mode 100644
index a129dc8..0000000
--- a/src/CamilStaps/BotleaguesApi/PasswordReminder.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: camilstaps
- * Date: 13-5-15
- * Time: 13:12
- */
-
-namespace CamilStaps\BotleaguesApi;
-
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Mail;
-
-class PasswordReminder extends Model {
-
-    protected $table = 'password_reminders';
-    protected $hidden = ['token'];
-    protected $fillable = ['userId', 'token', 'valid_till'];
-
-    /**
-     * Override the parent's save() function to automatically update the valid_till timestamp, and send an email
-     */
-    public function save(array $options = array()) {
-        $this->valid_till = date("Y-m-d H:i:s", time() + 3600);
-
-        $user = User::find($this->userId);
-        Mail::send('packages.camil-staps.botleagues-api.emails.auth.reminder', ['token' => $this->token], function($message) use ($user) {
-            $message->to($user->email, "User " . $user->id);
-        });
-
-        return parent::save($options);
-    }
-
-    /**
-     * Disable updated_at timestamp
-     */
-    public function setUpdatedAtAttribute($value) {}
-
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/User.php b/src/CamilStaps/BotleaguesApi/User.php
deleted file mode 100644
index 560f737..0000000
--- a/src/CamilStaps/BotleaguesApi/User.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Auth\Reminders\RemindableInterface;
-use Illuminate\Auth\UserInterface;
-use Illuminate\Database\Eloquent\Model;
-
-class User extends Model implements UserInterface, RemindableInterface {
-	
-    protected $table = 'users';
-	protected $hidden = ['password', 'remember_token', 'api_key'];
-    protected $fillable = ['email', 'password'];
-
-    public function isAdministrator() {
-        return (bool) $this->isAdministrator;
-    }
-
-    public function validToken($token) {
-        return UserToken::where('userId', $this->id)->where('token', $token)->where('valid_till', '>', date("Y-m-d H:i:s"))->count() > 0;
-    }
-
-    /**
-     * Get the unique identifier for the user.
-     *
-     * @return mixed
-     */
-    public function getAuthIdentifier() {
-        return $this->getKey();
-    }
-
-    /**
-     * Get the password for the user.
-     * @todo not implemented yet
-     * @return string
-     */
-    public function getAuthPassword() {
-        return $this->password;
-    }
-
-    /**
-     * Get the token value for the "remember me" session.
-     * @todo not implemented yet
-     * @return string
-     */
-    public function getRememberToken() {
-        return null;
-    }
-
-    /**
-     * Set the token value for the "remember me" session.
-     * @todo not implemented yet
-     * @param  string $value
-     * @return void
-     */
-    public function setRememberToken($value) {
-        return null;
-    }
-
-    /**
-     * Get the column name for the "remember me" token.
-     * @todo not implemented yet
-     * @return string
-     */
-    public function getRememberTokenName() {
-        return null;
-    }
-
-    /**
-     * Get the e-mail address where password reminders are sent.
-     *
-     * @return string
-     */
-    public function getReminderEmail() {
-        return $this->email;
-    }
-}
\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/UserToken.php b/src/CamilStaps/BotleaguesApi/UserToken.php
deleted file mode 100644
index 9909f6a..0000000
--- a/src/CamilStaps/BotleaguesApi/UserToken.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
-
-class UserToken extends Model {
-    
-    protected $table = 'user_tokens';
-    protected $hidden = ['token'];
-    protected $fillable = ['userId', 'token', 'valid_till'];
-
-    /**
-     * Override the parent's save() function to automatically update the valid_till timestamp
-     */
-    public function save(array $options = array()) {
-        $this->valid_till = date("Y-m-d H:i:s", time() + 3600);
-
-        return parent::save($options);
-    }
-
-}
\ No newline at end of file
-- 
cgit v1.2.3