Refactor Item and Unit serialization groups

Sylius · Dec 31, 2020 · abcf642 · abcf642
1 parent 0ca11c2
commit abcf642
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 35 deletions.
diff --git a/UPGRADE-1.8.md b/UPGRADE-1.8.md
@@ -28,6 +28,8 @@ If you are using they on your custom entity `api_resource` configuration or seri
     `order:create` changed to: `shop:order:create`
     `order:read` changed to: `admin:order:read`
     `order:update` changed to: `admin:order:update`
+    `order_item:read` changed to: `admin:order_item:read` and `shop:order_item:read`
+    `order_item_unit:read` changed to: `admin:order_item_unit:read` and `shop:order_item_unit:read`
     `shop:currencies:read` changed to: `shop:currency:read`
     `shop:customer:write` changed to: `shop:customer:create`
 

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/OrderItem.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/OrderItem.xml
@@ -16,23 +16,23 @@
            xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
 >
     <resource class="%sylius.model.order_item.class%" shortName="OrderItem">
-        <attribute name="normalization_context">
-            <attribute name="groups">
-                <attribute>order_item:read</attribute>
-            </attribute>
-        </attribute>
-
         <collectionOperations />
 
         <itemOperations>
             <itemOperation name="admin_get">
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/admin/order-items/{id}</attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">admin:order_item:read</attribute>
+                </attribute>
             </itemOperation>
 
             <itemOperation name="shop_get">
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/shop/order-items/{id}</attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">shop:order_item:read</attribute>
+                </attribute>
             </itemOperation>
         </itemOperations>
 

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/OrderItemUnit.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/OrderItemUnit.xml
@@ -16,26 +16,26 @@
            xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
 >
     <resource class="%sylius.model.order_item_unit.class%" shortName="OrderItemUnit">
-        <attribute name="normalization_context">
-            <attribute name="groups">
-                <attribute>order_item_unit:read</attribute>
-            </attribute>
-        </attribute>
+        <collectionOperations />
 
         <itemOperations>
             <itemOperation name="admin_get">
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/admin/order-item-units/{id}</attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">admin:order_item_unit:read</attribute>
+                </attribute>
             </itemOperation>
 
             <itemOperation name="shop_get">
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/shop/order-item-units/{id}</attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">shop:order_item_unit:read</attribute>
+                </attribute>
             </itemOperation>
         </itemOperations>
 
-        <collectionOperations />
-
         <property name="id" identifier="true" writable="false" />
         <property name="shippable" />
     </resource>

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/OrderItem.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/OrderItem.xml
@@ -17,64 +17,79 @@
 >
     <class name="Sylius\Component\Core\Model\OrderItem">
         <attribute name="id">
-            <group>shop:order:account:read</group>
-            <group>order_item:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
             <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="code">
-            <group>order_item:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="order">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="variant">
-            <group>shop:order:account:read</group>
-            <group>order_item:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
             <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="quantity">
-            <group>shop:order:account:read</group>
-            <group>order_item:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
             <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="unitPrice">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="units">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="adjustments">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="adjustmentsRecursively">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="adjustmentsTotal">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="adjustmentsTotalRecursively">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="product">
-            <group>order_item:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="productName">
-            <group>shop:order:account:read</group>
-            <group>order_item:read</group>
-            <group>shop:cart:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="subtotal">
-            <group>order_item:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
         <attribute name="total">
-            <group>order_item:read</group>
             <group>admin:order:read</group>
+            <group>admin:order_item:read</group>
+            <group>shop:order_item:read</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/OrderItemUnit.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/OrderItemUnit.xml
@@ -17,10 +17,12 @@
 >
     <class name="Sylius\Component\Core\Model\OrderItemUnit">
         <attribute name="id">
-            <group>order_item_unit:read</group>
+            <group>admin:order_item_unit:read</group>
+            <group>shop:order_item_unit:read</group>
         </attribute>
         <attribute name="shippable">
-            <group>order_item_unit:read</group>
+            <group>admin:order_item_unit:read</group>
+            <group>shop:order_item_unit:read</group>
         </attribute>
     </class>
 </serializer>