Added given_url in entry table

- Added index on entry table for given_url field
- Fix tests:

    The previous `bit.ly` url redirected to doc.wallabag but that url doesn't exist in the fixtures.
    I used our own internal "redirector" to create a redirect to an url which exist in the fixtures.

Also, updating current migration to use the new `WallabagMigration`.
This commit is contained in:
Nicolas Lœuillet
2017-07-10 21:32:25 +02:00
committed by Jeremy Benoist
parent e9579d6de9
commit b7fa51ae7d
6 changed files with 158 additions and 2 deletions

View File

@ -28,7 +28,8 @@ use Wallabag\UserBundle\Entity\User;
* @ORM\Index(name="created_at", columns={"created_at"}),
* @ORM\Index(name="uid", columns={"uid"}),
* @ORM\Index(name="hashed_url_user_id", columns={"user_id", "hashed_url"}, options={"lengths"={null, 40}})
* }
* },
* uniqueConstraints={@ORM\UniqueConstraint(name="IDX_entry_given_url",columns={"url", "given_url", "user_id"})}
* )
* @ORM\HasLifecycleCallbacks()
* @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
@ -67,6 +68,15 @@ class Entry
*/
private $title;
/**
* @var string
*
* @ORM\Column(name="given_url", type="text", nullable=true)
*
* @Groups({"entries_for_user", "export_all"})
*/
private $givenUrl;
/**
* @var string
*
@ -315,6 +325,30 @@ class Entry
return $this->title;
}
/**
* Set given url.
*
* @param string $givenUrl
*
* @return Entry
*/
public function setGivenUrl($givenUrl)
{
$this->givenUrl = $givenUrl;
return $this;
}
/**
* Get given Url.
*
* @return string
*/
public function getGivenUrl()
{
return $this->givenUrl;
}
/**
* Set url.
*