-
+
diff --git a/routes/api.php b/routes/api.php
index b51e139a41..96792a8f55 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1302,20 +1302,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
)->name('api.activity.index');
}); // end reports api routes
- /**
- * Notes API routes
- */
-
- Route::group(['prefix' => 'notes'], function () {
-
- Route::post(
- '/',
- [ Api\NotesController::class,
- 'store'
- ]
- )->name('api.notes.store');
- }); // end notes api routes
-
/**
diff --git a/routes/web.php b/routes/web.php
index b6f2655b41..a3df05ac76 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,6 +16,7 @@ use App\Http\Controllers\LabelsController;
use App\Http\Controllers\LocationsController;
use App\Http\Controllers\ManufacturersController;
use App\Http\Controllers\ModalController;
+use App\Http\Controllers\NotesController;
use App\Http\Controllers\ProfileController;
use App\Http\Controllers\ReportTemplatesController;
use App\Http\Controllers\ReportsController;
@@ -468,6 +469,9 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
});
+Route::group(['middleware' => ['auth']], function () {
+ Route::post('notes', [NotesController::class, 'store'])->name('notes.store');
+});
Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () {
diff --git a/tests/Feature/Notes/AssetNotesTest.php b/tests/Feature/Notes/AssetNotesTest.php
deleted file mode 100644
index c666cb9e3f..0000000000
--- a/tests/Feature/Notes/AssetNotesTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-create();
-
- $this->actingAsForApi(User::factory()->create())
- ->postJson(route('api.notes.store'), [
- 'note' => 'New Note!',
- 'type' => 'asset',
- 'id' => $asset->id,
- ])
- ->assertForbidden();
- }
-
- public function testValidation()
- {
- $asset = Asset::factory()->create();
-
- $this->actingAsForApi(User::factory()->editAssets()->create())
- ->postJson(route('api.notes.store'), [
- // 'note' => '',
- 'type' => 'a_type_not_asset',
- 'id' => $asset->id,
- ])
- ->assertOk()
- ->assertStatusMessageIs('error')
- ->assertJsonValidationErrors(['note', 'type'], 'messages');
- }
-
- public function testRequiresExistingAsset()
- {
- $this->actingAsForApi(User::factory()->editAssets()->create())
- ->postJson(route('api.notes.store'), [
- 'note' => 'New Note!',
- 'type' => 'asset',
- 'id' => 999_999,
- ])
- ->assertStatusMessageIs('error')
- ->assertMessagesAre('Asset not found');
- }
-
- public function testCanAddNoteToAsset()
- {
- Event::fake([NoteAdded::class]);
-
- $asset = Asset::factory()->create();
- $user = User::factory()->editAssets()->create();
-
- $this->actingAsForApi($user)
- ->postJson(route('api.notes.store'), [
- 'note' => 'New Note!',
- 'type' => 'asset',
- 'id' => $asset->id,
- ])
- ->assertOk()
- ->assertStatusMessageIs('success');
-
- Event::assertDispatchedTimes(NoteAdded::class, 1);
- Event::assertDispatched(NoteAdded::class, function (NoteAdded $event) use ($asset, $user) {
- return $event->itemNoteAddedOn->is($asset)
- && $event->note === 'New Note!'
- && $event->noteAddedBy->is($user);
- });
- }
-}
diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php
new file mode 100644
index 0000000000..a2caae6459
--- /dev/null
+++ b/tests/Feature/Notes/CreateNotesTest.php
@@ -0,0 +1,70 @@
+actingAs(User::factory()->create())
+ ->post(route('notes.store'))
+ ->assertForbidden();
+ }
+
+ public function testValidation()
+ {
+ $asset = Asset::factory()->create();
+
+ $this->actingAs(User::factory()->editAssets()->create())
+ ->post(route('notes.store'), [
+ 'id' => $asset->id,
+ // should be more...
+ ])
+ ->assertSessionHas('errors');
+ }
+
+ public function testAssetMustExist()
+ {
+ $this->actingAs(User::factory()->editAssets()->create())
+ ->post(route('notes.store'), [
+ 'id' => 999_999,
+ 'type' => 'asset',
+ 'note' => 'my note',
+ ])
+ ->assertStatus(302);
+ }
+
+ public function testCanCreateNoteForAsset()
+ {
+ $actor = User::factory()->editAssets()->create();
+
+ $asset = Asset::factory()->create();
+
+ $this->actingAs($actor)
+ ->withHeader('User-Agent', 'Custom User Agent For Test')
+ ->post(route('notes.store'), [
+ '_token' => '_token-to-simulate-request-from-gui',
+ 'id' => $asset->id,
+ 'type' => 'asset',
+ 'note' => 'my special note',
+ ])
+ ->assertRedirect(route('hardware.show', $asset->id) . '#history')
+ ->assertSessionHas('success', trans('general.note_added'));
+
+ $this->assertDatabaseHas('action_logs', [
+ 'created_by' => $actor->id,
+ 'action_type' => 'note added',
+ 'target_id' => null,
+ 'target_type' => null,
+ 'note' => 'my special note',
+ 'item_type' => Asset::class,
+ 'item_id' => $asset->id,
+ 'action_source' => 'gui',
+ 'user_agent' => 'Custom User Agent For Test',
+ ]);
+ }
+}
diff --git a/tests/Unit/Listeners/LogListenerTest.php b/tests/Unit/Listeners/LogListenerTest.php
index 5b0813c281..64dd2a3d67 100644
--- a/tests/Unit/Listeners/LogListenerTest.php
+++ b/tests/Unit/Listeners/LogListenerTest.php
@@ -3,7 +3,6 @@
namespace Tests\Unit\Listeners;
use App\Events\CheckoutableCheckedOut;
-use App\Events\NoteAdded;
use App\Listeners\LogListener;
use App\Models\Asset;
use App\Models\User;
@@ -38,19 +37,4 @@ class LogListenerTest extends TestCase
]);
}
- public function testLogsEntryOnAssetNoteCreation()
- {
- $asset = Asset::factory()->create();
- $noteAddedBy = User::factory()->create();
-
- event(new NoteAdded($asset, $noteAddedBy, 'My Cool Note!'));
-
- $this->assertDatabaseHas('action_logs', [
- 'action_type' => 'note_added',
- 'created_by' => $noteAddedBy->id,
- 'item_id' => $asset->id,
- 'item_type' => Asset::class,
- 'note' => 'My Cool Note!',
- ]);
- }
}