Update Collection Point details + Added new fields in the schema

app/Http/Controllers/API/Charity/CharityController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\API\Charity;
 
 use App\Http\Controllers\Controller;
+use App\Models\Charity;
 use App\Services\Charity\CharityService;
 use App\Http\Requests\API\Charity\UpdateRequest;
 use App\Http\Requests\API\Charity\AuthenticatedRequest;
@@ -19,6 +20,15 @@ public function index(AuthenticatedRequest $request, CharityService $charityServ
         ]);
     }
 
+    public function show($id, AuthenticatedRequest $request, CharityService $charityPointService) {
+         return response()->json([
+            'status' => 'success',
+            'data'   => [
+                'charity' => $charityPointService->show($id)
+            ]
+        ]);
+    }
+
     public function update(UpdateRequest $request, CharityService $charityService)
     {
         $charity = auth()->user()->charity();

app/Http/Controllers/API/CollectionPoint/CollectionPointController.php

@@ -6,6 +6,7 @@
 use App\Http\Requests\API\CollectionPoint\UpdateRequest;
 use App\Services\CollectionPoint\CollectionPointService;
 use App\Http\Requests\API\CollectionPoint\AuthenticatedRequest;
+use App\Models\CollectionPoint;
 
 class CollectionPointController extends Controller
 {
@@ -19,6 +20,27 @@ public function index(AuthenticatedRequest $request, CollectionPointService $col
         ]);
     }
 
+    public function getMealDetails(CollectionPoint $collectionPoint, AuthenticatedRequest $request, CollectionPointService $collectionPointService) {
+
+        return response()->json([
+            'status' => 'success',
+            'data'   => [
+                'collection_point' => $collectionPointService->getMealDetails($collectionPoint)
+            ]
+        ]);
+    }
+
+    public function updateMealDetails (CollectionPoint $collection_point_id, CollectionPointService $collectionPointService) {
+
+
+        return response()->json([
+            'status' => 'success',
+            'data'   => [
+                'collection_point' => $collectionPointService->get($id)
+            ]
+        ]);
+    }
+
     public function update(UpdateRequest $request, CollectionPointService $collectionPointService)
     {
         $collectionPoint = auth()->user()->collectionPoint();

app/Http/Controllers/API/CollectionPointController.php

@@ -4,8 +4,13 @@
 
 use App\Http\Controllers\Controller;
 use App\Services\User\CollectionPointService;
+use App\Services\CollectionPoint\CollectionPointService as MainCollectionPointService;
 use App\Http\Requests\API\User\AuthenticatedRequest;
+use App\Http\Requests\API\Charity\AuthenticatedRequest as CharityAuthenticatedRequest;
 use App\Services\All\PostcodeService;
+use App\Models\CollectionPoint;
+use App\Models\MealDetails;
+use Illuminate\Http\Response;
 
 class CollectionPointController extends Controller
 {
@@ -61,6 +66,37 @@ public function show($id, AuthenticatedRequest $request, CollectionPointService
         ]);
     }
 
+    public function getMealDetails($id, AuthenticatedRequest $request, MainCollectionPointService $collectionPointService) {
+
+        return response()->json([
+            'status' => 'success',
+            'data'   => [
+                'collection_point' => $collectionPointService->getMealDetails($id)
+            ]
+        ]);
+    }
+
+    public function updateMealDetails ($id, AuthenticatedRequest $request, MainCollectionPointService $collectionPointService) {
+
+        foreach ($request->all() as $value) {
+            if($value["type_of_meal"] !== MealDetails::HOT_FOOD && $value["type_of_meal"] !== MealDetails::HOME_ESSENTIALS && $value["type_of_meal"] !== MealDetails::SCHOOL_MEAL ) {
+                 return response()->json([
+                    'status' => 'error',
+                    'data'   => [],
+                    "message" => "Provide valid type_of_meal, valid type_of_meal are: " . MealDetails::HOT_FOOD . ", " .  MealDetails::SCHOOL_MEAL . ", " . MealDetails::HOME_ESSENTIALS
+                ], Response::HTTP_BAD_REQUEST );
+            }   
+        }
+
+
+        return response()->json([
+            'status' => 'success',
+            'data'   => [
+                'collection_point' => $collectionPointService->updateMealDetails($id, $request->all())
+            ]
+        ]);
+    }
+
     public function canDeliverToLocation($collectionPointId, AuthenticatedRequest $request, CollectionPointService $collectionPointService, PostcodeService $postcodeService)
     {
         $postCode = $request->input('postcode');
@@ -94,4 +130,23 @@ public function canDeliverToLocation($collectionPointId, AuthenticatedRequest $r
             ]
         ]);
     }
+
+    public function update($id, CharityAuthenticatedRequest $request, MainCollectionPointService $collectionPointService) {
+        $collection_points = auth()->user()->charities->map->collectionPoints->flatten();
+        if(!$collection_points->contains("id", $id)) {
+            return response()->json([
+                'status' => 'error',
+                'data'   => [],
+                "message" => "You are not part of this charity so you are not authorized to update this collection point. "
+            ], Response::HTTP_UNAUTHORIZED );
+        }
+
+        $collection_point =  $collection_points->firstWhere('id', $id);
+        $result = $collectionPointService->update($collection_point, $request->all());
+
+        return response()->json([
+            'status' => 'success',
+            'data'   => $result,
+        ], Response::HTTP_OK );
+    }
 }

app/Models/Charity.php

@@ -14,6 +14,12 @@ class Charity extends Model
         'name',
         'registration_number',
         'max_delivery_capacity',
+        'company_website',       
+        'contact_telephone',     
+        'personal_email', 
+        'personal_number',
+        'has_food_hygiene_cert',
+        'logo'                  
     ];
 
     protected $casts = [

app/Models/CollectionPoint.php

@@ -93,7 +93,10 @@ public function notifyAllUsers($notification)
     {
         foreach ($this->collectionPointUsers as $collectionPointUser) {
             $collectionPointUser->user->notify($notification);
-        }
+        };
+    }
+    public function mealDetails() {
+        return $this->hasMany(MealDetails::class, "collection_point_id");
     }
 
     public function smsAllUsers(SmsMessage $smsMessage)

app/Models/CollectionPointDaysOpen.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CollectionPointDaysOpen extends Model
+{
+    public function collectionPoint()
+    {
+        return $this->belongsTo(CollectionPoint::class);
+    }
+
+    public function days_open()
+    {
+        return $this->hasMany(DaysOpen::class);
+    }
+}

app/Models/DaysOpen.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class DaysOpen extends Model
+{
+    //
+}

app/Models/DietaryRequirements.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class DietaryRequirements extends Model
+{
+    //
+}

app/Models/MealType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MealType extends Model
+{
+    //
+}

app/Services/Charity/CharityService.php

@@ -15,6 +15,11 @@ public function get()
         return $user->charities->first();
     }
 
+    public function show($id)
+    {
+        return Charity::findorFail($id);
+    }
+
     public function create($data = [])
     {
         $charity = Charity::create([
@@ -34,6 +39,12 @@ public function update(Charity $charity, $data)
             'name'                  => $data['name'] ?? $charity->name,
             'registration_number'   => $data['registration_number'] ?? $charity->registration_number,
             'max_delivery_capacity' => $data['max_delivery_capacity'] ?? $charity->max_delivery_capacity,
+            'company_website'       => $data['company_website'] ?? $charity->company_website,
+            'contact_telephone'     => $data['contact_telephone'] ?? $charity->contact_telephone,
+            'personal_email'        => $data['personal_email'] ?? $charity->personal_email,
+            'personal_number'       => $data['personal_number'] ?? $charity->personal_number,
+            'has_food_hygiene_cert' => $data['has_food_hygiene_cert'] ?? $charity->has_food_hygiene_cert,
+            'logo'                  => $data['logo'] ?? $charity->logo,
         ]);
 
         event(new Updated($charity));

app/Services/CollectionPoint/CollectionPointService.php

@@ -15,6 +15,12 @@ public function get()
         return $user->collectionPoints->first();
     }
 
+    public function getMealDetails($id) {
+        $collectionPoint = CollectionPoint::findorFail((int) $id);
+        return $collectionPoint->mealDetails;
+    }
+
+
     public function create($data)
     {
         $collectionPoint = CollectionPoint::create([
@@ -41,6 +47,9 @@ public function update(CollectionPoint $collectionPoint, $data)
             'city'               => $data['city'] ?? $collectionPoint->city,
             'county'             => $data['county'] ?? $collectionPoint->county,
             'post_code'          => $data['post_code'] ?? $collectionPoint->post_code,
+            "start_pick_up_time"       => $data['start_pick_up_time'] ?? $collectionPoint->start_pick_up_time,
+            "end_pick_up_time"       => $data['end_pick_up_time'] ?? $collectionPoint->end_pick_up_time,
+            "cut_off_point"      => $data['cut_off_point'] ?? $collectionPoint->cut_off_point,
             'max_daily_capacity' => $data['max_daily_capacity'] ?? $collectionPoint->max_daily_capacity,
         ]);
 

database/factories/CollectionPointFactory.php

@@ -16,6 +16,9 @@
         'city'               => $faker->city,
         'county'             => $faker->county,
         'post_code'          => $faker->postcode,
+        "start_pick_up_time"       => $faker->dateTime("+10 hours"),
+        "end_pick_up_time"       => $faker->dateTime("+15 hours"),
+        "cut_off_point"       => $faker->dateTime("+10 hours"),
         'max_daily_capacity' => rand(50, 100),
     ];
 });

database/factories/DietaryRequirementsFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\Models\DietaryRequirements;
+use Faker\Generator as Faker;
+
+$factory->define(DietaryRequirements::class, function (Faker $faker) {
+    return [
+        "name" => "halal"
+    ];
+});

database/migrations/2020_11_22_115513_create_days_opens_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateDaysOpensTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('days_opens', function (Blueprint $table) {
+            $table->id();
+            $table->string("name");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('days_opens');
+    }
+}

database/migrations/2020_11_22_115539_create_meal_types_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateMealTypesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('meal_types', function (Blueprint $table) {
+            $table->id();
+            $table->string("name");
+            $table->text("image_url");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('meal_types');
+    }
+}

database/migrations/2020_11_22_115608_create_dietary_requirements_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateDietaryRequirementsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('dietary_requirements', function (Blueprint $table) {
+            $table->id();
+            $table->string("name");
+            $table->text("image_url");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('dietary_requirements');
+    }
+}