Fix inventory_part entity

app/Resources/relations/part_model.yml

@@ -153,3 +153,4 @@ wheel2a: 568c01
 11895pr0001c01: 11895
 92456pr0021c01: 92241p03c01
 
+15672: 92946

app/Resources/views/rebrickable/set/detail.html.twig

@@ -1,15 +1,18 @@
 {% extends 'base.html.twig' %}
 
 {% block content %}
-
-    {{ dump(set) }}
-
-    {{ brset ? dump(brset) }}
-
-    {#<h1>{{brset ? brset.name }}</h1>#}
-    {#<img src="{{brset ?  brset.imageURL }}">#}
-
     {% if set is not null %}
+        <dl>
+            <dt>number:</dt><dd>{{ set.number }}</dd>
+            <dt>year:</dt><dd>{{ set.year }}</dd>
+            <dt>name:</dt><dd>{{ set.name }}</dd>
+            <dt>theme:</dt><dd>{{ set.theme.name }}</dd>
+            <dt>count of parts:</dt><dd>{{ set.partCount }}</dd>
+        </dl>
+
+        <img class="ui bordered image medium" src="{{ rbset ?  rbset.imgUrl }}">
+
+
         <h4 class="ui horizontal divider header">
             <i class="cubes icon"></i> Parts {{ inventoryParts|length }}
         </h4>
@@ -21,7 +24,7 @@
                     <a class="ui right red circular label">{{ inventoryPart.quantity }}</a>
                     <a href="{{ path('rebrickable_part_show', {number: inventoryPart.part.number}) }}">
                         <img src="https://rebrickable.com/media/parts/ldraw/{{inventoryPart.color ? inventoryPart.color.id  }}/{{ inventoryPart.part.number }}.png">
-                        <div style="border-bottom: #{{ inventoryPart.color.rgb }} 2px solid" class="ui bottom attached label">{{ inventoryPart.part.number }}</div>
+                        <div style="border-bottom: #{{ inventoryPart.color.rgb }} 5px solid" class="ui bottom attached label">{{ inventoryPart.part.number }}<br>{{ inventoryPart.isSpare ? 'Spare' : 'Regular' }}</div>
                     </a>
                 </div>
             </div>
@@ -36,10 +39,10 @@
         <div class="ui eight column grid">
         {% for part in parts %}
             <div class="column">
-                <div class="ui fluid image">
+                <div class="ui bordered fluid image">
                     <a href="{{ path('model_detail', {number: part.number}) }}">
                         <img src="https://rebrickable.com/media/parts/ldraw/-1/{{ part.number }}.png">
-                        <div class="ui bottom attached label">{{ part.number }}</div>
+                        <div class="ui bottom attached label">{{ part.number }} </div>
                     </a>
                 </div>
             </div>
@@ -49,4 +52,7 @@
 
     {% endif %}
 
+    {{ brset ? dump(brset) }}
+
+
 {% endblock %}

src/AppBundle/Controller/Rebrickable/PartController.php

@@ -39,7 +39,7 @@ class PartController extends Controller
 
             $sets = $part != null ? $em->getRepository(Set::class)->findAllByPartNumber($part->getNumber()) : null;
 
-            return $this->render('rebrickable/part/show.html.twig', [
+            return $this->render('rebrickable/part/detail.html.twig', [
                 'part' => $part,
                 'apiPart' => $apiPart,
                 'sets' => $sets,

src/AppBundle/Controller/Rebrickable/SetController.php

@@ -57,6 +57,7 @@ class SetController extends Controller
 
         $set = $this->getDoctrine()->getManager()->getRepository(Set::class)->find($number);
 
+        $rbset = $this->get('api.manager.rebrickable')->getSet($number);
 
         $em = $this->getDoctrine()->getManager();
         $em->getRepository(Color::class)->findAll();
@@ -65,6 +66,7 @@ class SetController extends Controller
         return $this->render('rebrickable/set/detail.html.twig', [
             'set' => $set,
             'brset' => $brset,
+            'rbset' => $rbset,
             'parts' => $em->getRepository(Model::class)->findAllBySetNumber($number),
             'inventoryParts' => $em->getRepository(Inventory_Part::class)->findAllBySetNumber($number),
         ]);

src/AppBundle/Entity/Rebrickable/Inventory_Part.php

@@ -31,7 +31,7 @@ class Inventory_Part
      *
      * @ORM\Column(type="boolean")
      */
-    protected $isSpare;
+    protected $spare;
 
     /**
      * @var Part
@@ -102,9 +102,9 @@ class Inventory_Part
      *
      * @return Inventory_Part
      */
-    public function setIsSpare($isSpare)
+    public function setSpare($spare)
     {
-        $this->isSpare = $isSpare;
+        $this->spare = $spare;
 
         return $this;
     }
@@ -116,7 +116,7 @@ class Inventory_Part
      */
     public function isSpare()
     {
-        return $this->isSpare();
+        return $this->spare;
     }
 
     /**
@@ -140,7 +140,7 @@ class Inventory_Part
     }
 
     /**
-     * @return Set
+     * @return Inventory
      */
     public function getInventory()
     {

src/AppBundle/Service/Loader/RebrickableLoaderService.php

@@ -4,7 +4,7 @@ namespace AppBundle\Service\Loader;
 
 use AppBundle\Entity\Rebrickable\Set;
 
-//TODO Refactor
+//TODO Refactor + validate csv files
 class RebrickableLoaderService extends BaseLoaderService
 {
     private $rebrickable_url;
@@ -79,7 +79,7 @@ class RebrickableLoaderService extends BaseLoaderService
     {
         $file = $this->downloadFile($this->rebrickable_url.'inventory_parts.csv');
 
-        return $this->loadCsvFile($file, 'rebrickable_inventory_parts', '(`inventory_id`,`part_id`,`color_id`,`quantity`, @var) SET is_spare = IF(@var=\'t\',1,0)');
+        return $this->loadCsvFile($file, 'rebrickable_inventory_parts', '(`inventory_id`,`part_id`,`color_id`,`quantity`, @var) SET spare = IF(@var=\'t\',1,0)');
     }
 
     private function loadSetTable()