Return route id in menus API instead of an object (#258)

* Return route id in menus API instead of an object

* fixed migration script

* ByLine is required in storage but it's not required by validation

* tests

app/migrations/Version20170217123721.php

@@ -32,7 +32,7 @@ public function up(Schema $schema)
  $this->addSql('ALTER TABLE swp_article ALTER keywords DROP NOT NULL');
  $this->addSql('DROP INDEX swp_name_idx');
  $this->addSql('ALTER TABLE swp_container ADD revision_id INT DEFAULT NULL');
- $this->addSql('ALTER TABLE swp_container ADD uuid VARCHAR(255) NOT NULL');
+ $this->addSql('ALTER TABLE swp_container ADD uuid VARCHAR(255) NOT NULL DEFAULT substr(md5(random()::text), 0, 12);');
  $this->addSql('ALTER TABLE swp_container DROP width');
  $this->addSql('ALTER TABLE swp_container DROP height');
  $this->addSql('ALTER TABLE swp_container ALTER created_at SET DEFAULT \'now\'');
@@ -50,7 +50,6 @@ public function down(Schema $schema)
  // this down() migration is auto-generated, please modify it to your needs
  $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
- $this->addSql('CREATE SCHEMA public');
  $this->addSql('ALTER TABLE swp_revision_log DROP CONSTRAINT FK_A1F96AFD9AC03385');
  $this->addSql('ALTER TABLE swp_revision_log DROP CONSTRAINT FK_A1F96AFD21852C2F');
  $this->addSql('ALTER TABLE swp_container DROP CONSTRAINT FK_CF0E49301DFA7C8F');

src/SWP/Bundle/BridgeBundle/Resources/config/doctrine-orm/Item.orm.yml

@@ -18,6 +18,7 @@ SWP\Component\Bridge\Model\Item:
  type: string
  byline:
  type: string
+ nullable: true
  language:
  type: string
  description:

src/SWP/Bundle/BridgeBundle/Resources/config/doctrine-orm/Package.orm.yml

@@ -22,6 +22,7 @@ SWP\Component\Bridge\Model\Package:
  type: string
  byline:
  type: string
+ nullable: true
  language:
  type: string
  description:

src/SWP/Bundle/ContentBundle/Model/RouteAwareInterface.php

@@ -13,4 +13,9 @@ public function getRoute();
  * @param RouteInterface|null $route
  */
  public function setRoute(RouteInterface $route = null);
+
+ /**
+ * @return int|null
+ */
+ public function getRouteId();
 }

src/SWP/Bundle/ContentBundle/Model/RouteAwareTrait.php

@@ -1,5 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * This file is part of the Superdesk Web Publisher Content Bundle.
+ *
+ * Copyright 2017 Sourcefabric z.ú. and contributors.
+ *
+ * For the full copyright and license information, please see the
+ * AUTHORS and LICENSE files distributed with this source code.
+ *
+ * @copyright 2017 Sourcefabric z.ú
+ * @license http://www.superdesk.org/license
+ */
+
 namespace SWP\Bundle\ContentBundle\Model;
 
 trait RouteAwareTrait
@@ -24,4 +38,14 @@ public function setRoute(RouteInterface $route = null)
  {
  $this->route = $route;
  }
+
+ /**
+ * @return int|null
+ */
+ public function getRouteId()
+ {
+ if (null !== $this->route) {
+ return $this->route->getId();
+ }
+ }
 }

src/SWP/Bundle/CoreBundle/Resources/config/serializer/Model.MenuItem.yml

@@ -3,6 +3,9 @@ SWP\Bundle\CoreBundle\Model\MenuItem:
  properties:
  route:
  expose: true
+ type: integer
+ accessor:
+ getter: getRouteId
  relations:
  - rel: self
  href:

src/SWP/Bundle/CoreBundle/Tests/Controller/MenuControllerTest.php

@@ -496,4 +496,41 @@ private function assertCreatingChildren()
 
  return $firstChild;
  }
+
+ public function testAssignRouteToMenuApi()
+ {
+ $client = static::createClient();
+ $client->request('POST', $this->router->generate('swp_api_core_create_menu'), [
+ 'menu' => [
+ 'name' => 'navigation',
+ 'label' => 'Navigation',
+ ],
+ ]);
+
+ self::assertEquals(201, $client->getResponse()->getStatusCode());
+ $content = $client->getResponse()->getContent();
+
+ self::assertContains('"name":"navigation"', $content);
+ self::assertContains('"label":"Navigation"', $content);
+ self::assertContains('"route":null', $content);
+
+ $client->request('POST', $this->router->generate('swp_api_content_create_routes'), [
+ 'route' => [
+ 'name' => 'my-menu-route',
+ 'type' => 'collection',
+ ],
+ ]);
+
+ self::assertEquals(201, $client->getResponse()->getStatusCode());
+ $content = json_decode($client->getResponse()->getContent(), true);
+
+ $client->request('PATCH', $this->router->generate('swp_api_core_update_menu', ['id' => 1]), [
+ 'menu' => [
+ 'route' => $content['id'],
+ ],
+ ]);
+
+ self::assertEquals(200, $client->getResponse()->getStatusCode());
+ self::assertContains('"route":3', $content);
+ }
 }