Add delete education endpoint

Author: ymhuang0808

app/Http/Controllers/Api/V1_0/VolunteerProfileController.php

@@ -157,9 +157,11 @@ public function updateEducationMe(UpdateEducationRequest $request)
     {
         $this->getVolunteerIdentifier();
 
+        /*
+         * TODO: Need to check the id
+         */
         $id = StringUtil::getLastId($request->input('education_id'));
         $education = Education::findOrFail($id);
-        //$educationVolunteer = $education->volunteer()->first();
 
         // Check permission
         if (Gate::denies('update', $education)) {
@@ -172,6 +174,29 @@ public function updateEducationMe(UpdateEducationRequest $request)
         return response()->json(null, 204);
     }
 
+    /**
+     * Delete volunteer's own education
+     * 
+     * @param  Integer $educationId
+     */
+    public function deleteEducationMe($educationId)
+    {
+        $this->getVolunteerIdentifier();
+
+        $id = StringUtil::getLastId($educationId);
+        $education = Education::findOrFail($id);
+
+        // Check permission
+        if (Gate::denies('delete', $education)) {
+            // Forbidden to delete the education record
+            throw new AccessDeniedException();
+        }
+
+        $education->delete();
+
+        return response()->json(null, 204);
+    }
+
     protected function getVolunteerIdentifier()
     {
         try {

app/Http/routes.php

@@ -41,8 +41,9 @@
         $api->get('/users/me', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@showMe');
         $api->post('/users/me/skills', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@updateSkillsMe');
         $api->post('/users/me/equipment', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@updateEquipmentMe');
-        $api->post('/users/me/education', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@storeEducationMe');
-        $api->put('/users/me/education', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@updateEducationMe');
+        $api->post('/users/me/educations', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@storeEducationMe');
+        $api->put('/users/me/educations', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@updateEducationMe');
+        $api->delete('/users/me/educations/{education_id}', 'App\Http\Controllers\Api\V1_0\VolunteerProfileController@deleteEducationMe');
         $api->get('email_verification/{email_address}/{verification_code}',
                   'App\Http\Controllers\Api\V1_0\VolunteerAuthController@emailVerification');
     });

app/Policies/VolunteerEducationPolicy.php

@@ -21,4 +21,9 @@ public function update(Volunteer $volunteer, Education $education)
     {
         return $volunteer->id === $education->volunteer_id;
     }
+
+    public function delete(Volunteer $volunteer, Education $education)
+    {
+        return $volunteer->id === $education->volunteer_id;
+    }
 }

config/mail.php

@@ -54,7 +54,7 @@
     |
     */
 
-    'from' => ['address' => env('MAIL_FROM', null), 'name' => env('MAIL_NAME', null)],
+    'from' => ['address' => env('MAIL_FROM', 'vms@vms.app'), 'name' => env('MAIL_NAME', 'VMS')],
 
     /*
     |--------------------------------------------------------------------------

tests/MiddlewareTest.php

@@ -97,6 +97,6 @@ protected function factoryModel()
                 $city->country()->associate($country);
                 $city->save();
             }
-        }        
+        }
     }
 }

tests/ValidatorUtilTest.php

@@ -52,5 +52,5 @@ public function testFormatterWithDifferentMessage()
 
         $this->assertEquals('not_enough_password_strength', $actualNEPSFieldValidatorError->getCode());
         $this->assertContains('password', $actualNEPSFieldValidatorError->getFields());
-    }    
+    }
 }

tests/VolunteerAuthControllerTest.php

@@ -40,7 +40,7 @@ public function setUp()
 
     public function testJsonRequestValidation()
     {
-        $validationErrorPostData = 
+        $validationErrorPostData =
             json_decode(file_get_contents(__DIR__ . '/examples/register_post_validation_error.json'), true);
         $expectedJsonResponseBody = [
                             'message' => 'Validation failed',
@@ -82,7 +82,7 @@ public function testSuccessfulEmailVerification()
 
         $token = JWTAuth::fromUser($volunteer);
 
-        $this->json('get', 
+        $this->json('get',
                     '/api/email_verification/' . $volunteer->email . '/' . $code . '?token=' . $token,
                     [],
                     [
@@ -135,7 +135,6 @@ public function testSuccessfullyLogout()
                         'X-VMS-API-Key' => $this->apiKey
                     ])
              ->assertResponseStatus(204);
-
     }
 
     protected function factoryModel()
@@ -180,6 +179,6 @@ protected function factoryModel()
                 $city->country()->associate($country);
                 $city->save();
             }
-        }        
+        }
     }
 }

tests/VolunteerProfileControllerTest.php

@@ -223,7 +223,7 @@ public function testSuccessfullyStoreEductionMe()
             'end_year' => 2014
         ];
 
-        $this->json('post', '/api/users/me/education', $postData,
+        $this->json('post', '/api/users/me/educations', $postData,
                     [
                         'Authorization' => 'Bearer ' . $token,
                         'X-VMS-API-Key' => $this->apiKey
@@ -253,12 +253,14 @@ public function testSuccessfullyUpdateEducationMe()
             'end_year' => 2014
         ];
 
-        $this->json('put', '/api/users/me/education', $putData,
+        $this->json('put', '/api/users/me/educations', $putData,
                     [
                         'Authorization' => 'Bearer ' . $token,
                         'X-VMS-API-Key' => $this->apiKey
                     ])
              ->assertResponseStatus(204);
+
+        $this->seeInDatabase('educations', ['id' => $education->id, 'degree' => 4]);
     }
 
     public function testUpdateEducationMeAccessDeniedException()
@@ -297,7 +299,7 @@ public function testUpdateEducationMeAccessDeniedException()
             'end_year' => '2013'
         ];
 
-        $this->json('put', '/api/users/me/education', $putData,
+        $this->json('put', '/api/users/me/educations', $putData,
                     [
                         'Authorization' => 'Bearer ' . $token,
                         'X-VMS-API-Key' => $this->apiKey
@@ -309,7 +311,29 @@ public function testUpdateEducationMeAccessDeniedException()
                     ]]
                 ])
              ->assertResponseStatus(403);
+    }
+
+    public function testSuccessfullyDeleteEducationMe()
+    {
+        $this->factoryModel();
+
+        $volunteer = factory(App\Volunteer::class)->create();
+        $volunteer->is_actived = true;
+
+        $education = factory(App\Education::class)->make();
+        $volunteer->educations()->save($education);
 
+        $token = JWTAuth::fromUser($volunteer);
+
+        $this->json('delete',
+                    '/api/users/me/educations/' . $education->id
+                    ,[]
+                    ,[
+                        'Authorization' => 'Bearer ' . $token,
+                        'X-VMS-API-Key' => $this->apiKey
+                    ])
+             ->assertResponseStatus(204);
+        $this->notSeeInDatabase('educations', ['id' => $education->id]);
     }
 
     protected function factoryModel()
@@ -354,6 +378,6 @@ protected function factoryModel()
                 $city->country()->associate($country);
                 $city->save();
             }
-        }        
+        }
     }
 }