diff --git a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php index 98d75e8b..6493811d 100644 --- a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php +++ b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php @@ -3,6 +3,7 @@ namespace App\Classes\Modules\Announcements\DataTransferObjects; use App\Classes\General\Interfaces\DataTransferObject; +use Carbon\Carbon; class AnnouncementObject implements DataTransferObject { @@ -53,18 +54,20 @@ class AnnouncementObject implements DataTransferObject } /** - * @return string + * @return Carbon */ - public function getStartingOn(): string + public function getStartingOn(): Carbon { - return $this->starting_on; +// return $this->starting_on; + return Carbon::parse($this->starting_on); } /** - * @return string + * @return Carbon */ - public function getEndingOn(): string + public function getEndingOn(): Carbon { - return $this->ending_on; +// return $this->ending_on; + return Carbon::parse($this->ending_on); } } diff --git a/app/Http/Resources/AnnouncementResource.php b/app/Http/Resources/AnnouncementResource.php new file mode 100644 index 00000000..26e1c2f9 --- /dev/null +++ b/app/Http/Resources/AnnouncementResource.php @@ -0,0 +1,28 @@ + $this->id, + 'title' => $this->title, + 'description' => $this->description, + 'segments' => $this->segments, + 'starting_on' => Carbon::parse($this->starting_on)->format('Y-m-d'), + 'ending_on' => Carbon::parse($this->ending_on)->format('Y-m-d'), + 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), + ]; + } +} diff --git a/routes/announcement.php b/routes/announcement.php index 7ead50e3..6b460a01 100644 --- a/routes/announcement.php +++ b/routes/announcement.php @@ -8,8 +8,9 @@ Route::group(['prefix' => 'announcement', 'as' => 'announcement.', 'namespace' = Route::put('/update/{id}', 'UpdateAnnouncementController@update')->name('update'); Route::delete('/delete/{id}', 'DeleteAnnouncementController@delete')->name('delete'); - Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () { + Route::group(['prefix' => '/{id}/segment', 'as' => 'segment.'], function () { Route::post('/assign', 'AssignAnnouncementToSegmentController@assign')->name('assign'); Route::delete('/detach/{segment_id}', 'RemoveSegmentFromAnnouncementController@detach')->name('detach'); }); + }); \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index 1ebe1740..b681ce82 100644 --- a/routes/api.php +++ b/routes/api.php @@ -56,4 +56,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function Route::get('/report/service', 'Reports\MonthlyReportController@serviceReport')->name('report.service'); }); + + require __DIR__ . '/announcement.php'; });