Submissions WIP

jayar95 · Mar 8, 2018 · f3a38a1 · f3a38a1
1 parent f4237eb
commit f3a38a1
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 63 deletions.
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -2,10 +2,11 @@
 	namespace App\Http\Controllers;
 
 	use Illuminate\Http\Request;
+	use Illuminate\Http\JsonResponse;
 
 	class AuthController extends Controller {
 		/**
-		 * @return void
+		 * AuthController constructor.
 		 */
 		public function __construct() {
 			$this->middleware('auth:api', ['except' => ['login']]);
@@ -14,9 +15,9 @@ public function __construct() {
 		/**
 		 * @param Request $request
 		 *
-		 * @return \Illuminate\Http\JsonResponse
+		 * @return JsonResponse
 		 */
-		public function login(Request $request) {
+		public function login(Request $request): JsonResponse {
 			$this->validate($request, [
 				'email' => 'required',
 				'password' => 'required'
@@ -34,16 +35,16 @@ public function login(Request $request) {
 		}
 
 		/**
-		 * @return \Illuminate\Http\JsonResponse
+		 * @return JsonResponse
 		 */
-		public function me() {
+		public function me(): JsonResponse {
 			return response()->json(auth()->user());
 		}
 
 		/**
-		 * @return \Illuminate\Http\JsonResponse
+		 * @return JsonResponse
 		 */
-		public function logout() {
+		public function logout(): JsonResponse {
 			auth()->logout();
 
 			return response()->json([
@@ -52,18 +53,18 @@ public function logout() {
 		}
 
 		/**
-		 * @return \Illuminate\Http\JsonResponse
+		 * @return JsonResponse
 		 */
-		public function refresh() {
+		public function refresh(): JsonResponse {
 			return $this->respondWithToken(auth()->refresh());
 		}
 
 		/**
 		 * @param  string $token
 		 *
-		 * @return \Illuminate\Http\JsonResponse
+		 * @return JsonResponse
 		 */
-		protected function respondWithToken($token) {
+		protected function respondWithToken($token): JsonResponse {
 			return response()->json([
 				'access_token' => $token,
 				'token_type' => 'bearer',

diff --git a/app/Http/Controllers/RegisterController.php b/app/Http/Controllers/RegisterController.php
@@ -1,5 +1,4 @@
 <?php
-
 	namespace App\Http\Controllers;
 
 	use App\User;
@@ -12,9 +11,7 @@ class RegisterController extends Controller {
 		use RegistersUsers;
 
 		/**
-		 * Create a new controller instance.
-		 *
-		 * @return void
+		 * RegisterController constructor.
 		 */
 		public function __construct() {
 			$this->middleware('guest');

diff --git a/app/Http/Controllers/RiddleController.php b/app/Http/Controllers/RiddleController.php
@@ -2,6 +2,8 @@
 	namespace App\Http\Controllers;
 
 	use App\Riddle;
+	use App\RiddleAnswer;
+	use App\Submission;
 	use Illuminate\Http\JsonResponse;
 	use Illuminate\Http\Request;
 
@@ -21,6 +23,9 @@ class RiddleController extends Controller {
 			'answer' => 'required',
 		];
 
+		/**
+		 * RiddleController constructor.
+		 */
 		public function __construct() {
 			$this->middleware('auth:api');
 		}
@@ -94,6 +99,11 @@ public function delete(Request $request, Riddle $riddle): JsonResponse {
 		public function createSubmission(Request $request, Riddle $riddle): JsonResponse {
 			$this->validate($request, $this->validateSubmissionFields);
 
+			if ($riddle->maxSubmissionCount === $riddle->getSubmissionCountByUser(auth()->user()))
+				return response()->json([
+					'message' => 'Max submission limit reached.',
+				], 200);
+
 			$submission = Submission::create([
 				'answer' => $request->get('answer'),
 				'user_id' => auth()->user()->id,
@@ -102,4 +112,21 @@ public function createSubmission(Request $request, Riddle $riddle): JsonResponse
 
 			return response()->json($submission->toJson(), 201);
 		}
+
+		/**
+		 * @param Request $request
+		 * @param Riddle  $riddle
+		 *
+		 * @return JsonResponse
+		 */
+		public function createAnswer(Request $request, Riddle $riddle): JsonResponse {
+			$this->validate($request, ['answer' => 'required']);
+
+			$answer = RiddleAnswer::create([
+				'answer' => $request->get('answer'),
+				'riddle_id' => $riddle->id,
+			]);
+
+			return response()->json($answer->toJson(), 201);
+		}
 	}
diff --git a/app/Http/Controllers/SubmissionController.php b/app/Http/Controllers/SubmissionController.php
diff --git a/app/Http/Middleware/StaffCheck.php b/app/Http/Middleware/StaffCheck.php
@@ -1,5 +1,4 @@
 <?php
-
 	namespace App\Http\Middleware;
 
 	use App\Exceptions\PermissionDeniedException;

diff --git a/app/Riddle.php b/app/Riddle.php
@@ -27,4 +27,15 @@ class Riddle extends Model {
 		public function winner() {
 			return $this->hasOne('App\User', 'winner');
 		}
+
+		/**
+		 * @param User $user
+		 *
+		 * @return int
+		 */
+		public function getSubmissionCountByUser(User $user): int {
+			return Submission::where('riddle_id', $this->id)
+				->where('user_id', $user->id)
+				->count();
+		}
 	}
diff --git a/app/RiddleAnswer.php b/app/RiddleAnswer.php
@@ -2,6 +2,7 @@
 	namespace App;
 
 	use Illuminate\Database\Eloquent\Model;
+	use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 	class RiddleAnswer extends Model {
 		protected $fillable = [
@@ -10,9 +11,9 @@ class RiddleAnswer extends Model {
 		];
 
 		/**
-		 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+		 * @return BelongsTo
 		 */
-		public function riddle() {
+		public function riddle(): BelongsTo {
 			return $this->belongsTo('App\Riddle');
 		}
 	}
diff --git a/app/Submission.php b/app/Submission.php
@@ -2,15 +2,22 @@
 	namespace App;
 
 	use Illuminate\Database\Eloquent\Model;
+	use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 	class Submission extends Model {
+		/**
+		 * @var array
+		 */
 		protected $fillable = [
 			'user_id',
 			'answer',
 			'riddle_id'
 		];
 
-		public function user() {
+		/**
+		 * @return BelongsTo
+		 */
+		public function user(): BelongsTo {
 			return $this->belongsTo('App\User');
 		}
 	}
diff --git a/app/User.php b/app/User.php
@@ -1,5 +1,4 @@
 <?php
-
 	namespace App;
 
 	use Tymon\JWTAuth\Contracts\JWTSubject;

diff --git a/database/migrations/2018_03_06_191427_create_riddles_table.php b/database/migrations/2018_03_06_191427_create_riddles_table.php
@@ -16,6 +16,7 @@ public function up() {
 				$table->longText('content')->nullable(false);
 				$table->string('title', 255)->nullable(false);
 				$table->integer('winner')->unsigned()->nullable(true);
+				$table->integer('max_submission_count')->unsigned();
 				$table->softDeletes();
 				$table->timestamps();
 

diff --git a/routes/api.php b/routes/api.php
@@ -1,8 +1,6 @@
 <?php
 	use App\Http\Resources\RiddleResource;
 	use App\Riddle;
-	use App\Http\Resources\SubmissionResource;
-	use App\Submission;
 
 	Route::group([
 		'middleware' => 'api',
@@ -26,10 +24,6 @@
 
 	Route::delete('riddle/{riddle}', 'RiddleController@delete')->middleware('staff.check');
 
-	Route::post('riddle/{riddle}/submissions', 'SubmissionController@create')->middleware('staff.check');
+	Route::post('riddle/{riddle}/submissions', 'RiddleController@createSubmission')->middleware('staff.check');
 
-	Route::get('riddle/{riddle}/submissions', function() {
-		return new SubmissionResource(Submission::all());
-	})->middleware('staff.check');
-
-	Route::get('riddle/{riddle}/my-submissions');
+	Route::post('riddle/{riddle}/riddle-answer')->middleware('staff.check');