Merge pull request #16 from ConductionNL/development-barry

Datamodel project added and postman_collection adjusted

.env

@@ -24,8 +24,8 @@ APP_BUILD=dev
 APP_DESCRIPTION='Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.'
 
 
-APP_LOGO=pc.zaakonline.nl
-APP_HOME=pc.zaakonline.nl
+APP_LOGO=orc.zaakonline.nl
+APP_HOME=orc.zaakonline.nl
 
 # The urls on wich this api is available
 TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
@@ -49,9 +49,9 @@ ORGANIZATION_UNIT_NAME=Common-Ground
 ##################################################
 
 # The subdomain for this component (should be www for applications)
-APP_SUBDOMAIN=pc
+APP_SUBDOMAIN=orc
 # he domains on wich you want to provide this component, the first wil be used as primary (or common in cert-manger terms)
-APP_DOMAINS=["conduction.nl","vng.cloud","zaakonline.nl","larping.eu","common-ground.dev","trouwplanner.online","huwelijksplanner.online"]
+APP_DOMAINS=["conduction.nl","zaakonline.nl","huwelijksplanner.online","common-ground.dev"]
 # The demo enviroment for this component @depracticed
 APP_USE_NAME_AS_SUBDOMAIN=true
 # If set to true wil provide the component on an {APP_NAME}.{APP_DOMAIN} basis for production enviroment, and  {APP_NAME}.{APP_ENV}.{APP_DOMAIN} basis for other enviroments. Wil skipp the {APP_NAME}. on both if set to false 
@@ -64,6 +64,7 @@ APP_REPRO=https://github.com/ConductionNL/Proto-component-commonground
 ##################################################
 
 CONTAINER_REGISTRY_BASE=docker.io/conduction
+CONTAINER_PROJECT_TITLE=Order Registratie Component
 CONTAINER_PROJECT_NAME=orc
 CONTAINER_REPRO=https://hub.docker.com/repository/docker/conduction/orc-php
 

api/.env

@@ -25,7 +25,6 @@ CONDUCTION_COMMONGROUND_BAG_APIKEY=!ChangeMe!
 #APP_VERSION=0.0.1
 #APP_TITLE='Proto Component (PC)'
 #APP_NAME='pc'
-APP_DESCRIPTION='Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.'
 APP_SECRET=!ChangeMe!
 #TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
 #TRUSTED_HOSTS='^(.+\.)?localhost|api$'
@@ -36,6 +35,8 @@ GOOGLE_TAG_MANAGER_ID='UA-143369164-2'
 HUBSPOT_EMBED_CODE=6108438
 ###< symfony/framework-bundle ###
 
+
+
 ###> doctrine/doctrine-bundle ###
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"

api/config/packages/api_platform.yaml

@@ -58,17 +58,3 @@ api_platform:
         yaml:     ['application/x-yaml']
         csv:      ['text/csv']
         html:     ['text/html']
-
-    # Varnish integration, remove if unwanted
-    # http_cache:
-    #    invalidation:
-    #        enabled: true
-    #        varnish_urls: ['%env(VARNISH_URL)%']
-    #    max_age: 0
-    #    shared_max_age: 3600
-    #    vary: ['Content-Type', 'Authorization']
-    #    public: true
-
-    # Mercure integration, remove if unwanted
-    # mercure:
-    #    hub_url: '%env(MERCURE_SUBSCRIBE_URL)%'

api/config/packages/common_ground.yaml

@@ -13,11 +13,14 @@ parameters:
     common_ground.oas.servers:
             -
               description: Demo Omgeving
-              url: 'http://orc.zaakonline.nl'       
+              url: 'http://pdc.zaakonline.nl'       
     common_ground.oas.externalDocs:
             -
               description: OAS Documentatie
-              url: 'http://orc.zaakonline.nl'  
+              url: 'http://pdc.zaakonline.nl'  
+            -
+              description: Repository
+              url: 'https://github.com/ConductionNL/productenendienstencatalogus'  
     common_ground.oas.developers:
             -
               name: Conduction

api/docker/nginx/conf.d/default.conf

@@ -10,7 +10,7 @@ server {
         # Comment the next line and uncomment the next to enable dynamic resolution (incompatible with Kubernetes)
         fastcgi_pass php:9000;
         #resolver 127.0.0.11;
-        #set $upstream_host orderregistratiecomponent-php;
+        #set $upstream_host commonground-php;
         #fastcgi_pass $upstream_host:9000;
 
         fastcgi_split_path_info ^(.+\.php)(/.*)$;

api/docker/php/docker-entrypoint.sh

@@ -60,8 +60,8 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 		bin/console doctrine:schema:update --force --no-interaction			
 
 		# If you want to retain data in your dev enviroment comment this command out
-		echo "Loading fixtures"
-		bin/console doctrine:fixtures:load  --no-interaction
+		#echo "Loading fixtures"
+		#bin/console doctrine:fixtures:load  --no-interaction
 
 		# Lets update the docs to show the latest chages
 		echo "Creating OAS documentation"

api/helm/Chart.yaml

@@ -3,5 +3,5 @@ appVersion: V.0.1
 description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.''
 name: orc
 version: 0.1.0
-home: pc.zaakonline.nl
-icon: pc.zaakonline.nl
+home: orc.zaakonline.nl
+icon: orc.zaakonline.nl

api/helm/requirements.lock

@@ -4,6 +4,6 @@ dependencies:
   version: 3.9.5
 - name: mercure
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.0.0
-digest: sha256:6466d376987cc08b70fe36945dd93474836aab05edc155955951bcb0774a0896
-generated: 2019-03-26T18:14:32.4074+01:00
+  version: 1.0.10
+digest: sha256:2b1dc0e22ab3974a2cc38dcfd66df92049dd566d07a9596608233cb00dd5e8a6
+generated: 2019-09-26T06:59:58.2989295+02:00

api/helm/values.yaml

@@ -10,16 +10,13 @@ settings:
   version: V.0.1
   description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.''
   repro: 'https://github.com/ConductionNL/Proto-component-commonground'
-  subdomain: pc  
+  subdomain: orc  
   domains:
     - conduction.nl
-    - vng.cloud
     - zaakonline.nl
-    - larping.eu
-    - common-ground.dev
-    - trouwplanner.online
     - huwelijksplanner.online
-  domainsJson: ["conduction.nl","vng.cloud","zaakonline.nl","larping.eu","common-ground.dev","trouwplanner.online","huwelijksplanner.online"]
+    - common-ground.dev
+  domainsJson: ["conduction.nl","zaakonline.nl","huwelijksplanner.online","common-ground.dev"]
   organisationName: Conduction
   email: [email protected]
   country: Netherlands

api/public/schema/openapi.yaml

@@ -1229,14 +1229,17 @@ components:
           description: 'The RSIN of the organization that ownes this proces'
           type: string
         price:
+          readOnly: true
           description: 'The price of this product'
           type: string
         priceCurrency:
+          readOnly: true
           description: 'The currency of this product in an [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) format'
           externalDocs:
             url: 'http://schema.org/priceCurrency'
           type: string
         tax:
+          readOnly: true
           description: 'The total tax over the order'
           type: string
         createdAt:
@@ -1257,14 +1260,12 @@ components:
       required:
         - name
         - targetOrganization
-        - price
     Order-write:
       type: object
       description: 'An entity representing an order.'
       required:
         - name
         - targetOrganization
-        - price
       properties:
         name:
           description: 'The name of the order'
@@ -1275,17 +1276,6 @@ components:
         targetOrganization:
           description: 'The RSIN of the organization that ownes this proces'
           type: string
-        price:
-          description: 'The price of this product'
-          type: string
-        priceCurrency:
-          description: 'The currency of this product in an [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) format'
-          externalDocs:
-            url: 'http://schema.org/priceCurrency'
-          type: string
-        tax:
-          description: 'The total tax over the order'
-          type: string
         items:
           description: 'The items in this order'
           type: array
@@ -1329,14 +1319,17 @@ components:
           description: 'The RSIN of the organization that ownes this proces'
           type: string
         price:
+          readOnly: true
           description: 'The price of this product'
           type: string
         priceCurrency:
+          readOnly: true
           description: 'The currency of this product in an [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) format'
           externalDocs:
             url: 'http://schema.org/priceCurrency'
           type: string
         tax:
+          readOnly: true
           description: 'The total tax over the order'
           type: string
         createdAt:
@@ -1357,14 +1350,12 @@ components:
       required:
         - name
         - targetOrganization
-        - price
     'Order:jsonld-write':
       type: object
       description: 'An entity representing an order.'
       required:
         - name
         - targetOrganization
-        - price
       properties:
         '@context':
           readOnly: true
@@ -1384,17 +1375,6 @@ components:
         targetOrganization:
           description: 'The RSIN of the organization that ownes this proces'
           type: string
-        price:
-          description: 'The price of this product'
-          type: string
-        priceCurrency:
-          description: 'The currency of this product in an [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) format'
-          externalDocs:
-            url: 'http://schema.org/priceCurrency'
-          type: string
-        tax:
-          description: 'The total tax over the order'
-          type: string
         items:
           description: 'The items in this order'
           type: array
@@ -1451,22 +1431,13 @@ components:
           type: string
           format: date-time
       required:
-        - name
         - order
         - offer
         - quantity
-        - price
         - taxPercentage
     OrderItem-write:
       type: object
       description: 'An entity representing an item of an order.'
-      required:
-        - name
-        - order
-        - offer
-        - quantity
-        - price
-        - taxPercentage
       properties:
         name:
           description: 'The name of the object'
@@ -1499,6 +1470,11 @@ components:
         taxPercentage:
           description: 'The tax percentage for this offer as an integer e.g. 9% makes 9'
           type: integer
+      required:
+        - order
+        - offer
+        - quantity
+        - taxPercentage
     'OrderItem:jsonld-read':
       type: object
       description: 'An entity representing an item of an order.'
@@ -1554,22 +1530,13 @@ components:
           type: string
           format: date-time
       required:
-        - name
         - order
         - offer
         - quantity
-        - price
         - taxPercentage
     'OrderItem:jsonld-write':
       type: object
       description: 'An entity representing an item of an order.'
-      required:
-        - name
-        - order
-        - offer
-        - quantity
-        - price
-        - taxPercentage
       properties:
         '@context':
           readOnly: true
@@ -1611,6 +1578,11 @@ components:
         taxPercentage:
           description: 'The tax percentage for this offer as an integer e.g. 9% makes 9'
           type: integer
+      required:
+        - order
+        - offer
+        - quantity
+        - taxPercentage
 definitions:
   Order-read:
     properties:
@@ -1644,7 +1616,6 @@ definitions:
     required:
       - name
       - targetOrganization
-      - price
   Order-write:
     properties:
       name:
@@ -1656,20 +1627,13 @@ definitions:
       targetOrganization:
         example: '002851234'
         maxLength: 255
-      price:
-        example: '50.00'
-      priceCurrency:
-        example: EUR
-      tax:
-        example: '21.00'
       customer:
         example: 'https://example.org/people/1'
         format: url
       items: []
     required:
       - name
       - targetOrganization
-      - price
   OrderItem-read:
     properties:
       id:
@@ -1697,9 +1661,7 @@ definitions:
       createdAt: []
       order: []
     required:
-      - name
       - offer
-      - price
       - order
   OrderItem-write:
     properties:
@@ -1724,9 +1686,7 @@ definitions:
         example: '9'
       order: []
     required:
-      - name
       - offer
-      - price
       - order
 tags:
   -
@@ -1760,11 +1720,14 @@ host: irc.zaakonline.nl
 servers:
   -
     description: 'Demo Omgeving'
-    url: 'http://orc.zaakonline.nl'
+    url: 'http://pdc.zaakonline.nl'
 externalDocs:
   -
     description: 'OAS Documentatie'
-    url: 'http://orc.zaakonline.nl'
+    url: 'http://pdc.zaakonline.nl'
+  -
+    description: Repository
+    url: 'https://github.com/ConductionNL/productenendienstencatalogus'
 x-commonground:
   type: service
   developers:

api/public/schema/orc.postman_collection.json

@@ -3903,7 +3903,7 @@
 	],
 	"variable": [
 		{
-			"id": "8200fa95-7c8d-4975-81b2-e77b0883c3c7",
+			"id": "4e8fc628-c17e-4d2f-8477-147239feada4",
 			"key": "baseUrl",
 			"value": "localhost:8080",
 			"type": "string"