Compare commits
4 changed files with 2 additions and 92 deletions
|
|
@ -40,7 +40,6 @@ class Article extends Model
|
|||
return [
|
||||
'titleurl' => [
|
||||
'source' => 'title',
|
||||
'includeTrashed' => true,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,29 +8,12 @@ use App\Models\Article;
|
|||
|
||||
class ArticleService
|
||||
{
|
||||
/**
|
||||
* @throws \InvalidArgumentException if a published article already has this title
|
||||
*/
|
||||
public function create(array $data): Article
|
||||
{
|
||||
$attributes = [
|
||||
return Article::create([
|
||||
'title' => $data['name'],
|
||||
'main' => $data['content'],
|
||||
'published' => ($data['post-status'] ?? null) !== 'draft',
|
||||
];
|
||||
|
||||
$existing = Article::where('title', $data['name'])->first();
|
||||
|
||||
if ($existing !== null) {
|
||||
if ($existing->published) {
|
||||
throw new \InvalidArgumentException("An article titled \"{$data['name']}\" has already been published");
|
||||
}
|
||||
|
||||
$existing->update($attributes);
|
||||
|
||||
return $existing;
|
||||
}
|
||||
|
||||
return Article::create($attributes);
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ use App\Exceptions\MicropubHandlerException;
|
|||
use App\Jobs\SendWebMentions;
|
||||
use App\Jobs\SyndicateNoteToBluesky;
|
||||
use App\Jobs\SyndicateNoteToMastodon;
|
||||
use App\Models\Article;
|
||||
use App\Models\Media;
|
||||
use App\Models\Note;
|
||||
use App\Models\Place;
|
||||
|
|
@ -912,64 +911,4 @@ class MicropubControllerTest extends TestCase
|
|||
'published' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function micropub_client_api_request_updates_an_existing_draft_article_with_the_same_name(): void
|
||||
{
|
||||
$draft = Article::create([
|
||||
'title' => 'WireGuard',
|
||||
'main' => 'Early draft content',
|
||||
'published' => false,
|
||||
]);
|
||||
|
||||
$response = $this->postJson(
|
||||
'/api/post',
|
||||
[
|
||||
'type' => ['h-entry'],
|
||||
'properties' => [
|
||||
'name' => ['WireGuard'],
|
||||
'content' => ['Finished content'],
|
||||
],
|
||||
],
|
||||
['HTTP_Authorization' => 'Bearer '.$this->getToken()]
|
||||
);
|
||||
|
||||
$response
|
||||
->assertJson(['response' => 'created'])
|
||||
->assertStatus(201);
|
||||
$this->assertSame(1, Article::where('title', 'WireGuard')->count());
|
||||
$this->assertDatabaseHas('articles', [
|
||||
'id' => $draft->id,
|
||||
'title' => 'WireGuard',
|
||||
'main' => 'Finished content',
|
||||
'published' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function micropub_client_api_request_errors_when_an_article_with_the_same_name_is_already_published(): void
|
||||
{
|
||||
Article::create([
|
||||
'title' => 'WireGuard',
|
||||
'main' => 'Published content',
|
||||
'published' => true,
|
||||
]);
|
||||
|
||||
$response = $this->postJson(
|
||||
'/api/post',
|
||||
[
|
||||
'type' => ['h-entry'],
|
||||
'properties' => [
|
||||
'name' => ['WireGuard'],
|
||||
'content' => ['Some other content'],
|
||||
],
|
||||
],
|
||||
['HTTP_Authorization' => 'Bearer '.$this->getToken()]
|
||||
);
|
||||
|
||||
$response
|
||||
->assertJson(['error' => 'invalid_request'])
|
||||
->assertStatus(400);
|
||||
$this->assertSame(1, Article::where('title', 'WireGuard')->count());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,17 +74,6 @@ class ArticlesTest extends TestCase
|
|||
$this->assertEquals(config('app.url').$article->link, $article->uri);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function slug_is_suffixed_when_a_trashed_article_already_used_it(): void
|
||||
{
|
||||
$original = Article::create(['title' => 'My Title', 'main' => 'Content']);
|
||||
$original->delete();
|
||||
|
||||
$newArticle = Article::create(['title' => 'My Title', 'main' => 'Other content']);
|
||||
|
||||
$this->assertEquals('my-title-2', $newArticle->titleurl);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function date_scope_returns_expected_articles(): void
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue