Merge pull request #36 from ConductionNL/dev-robert_1

Adding "audience" property, setting datafixture for "ringen" product

.env

@@ -24,7 +24,6 @@ APP_BUILD=dev
 # The description for this api
 APP_DESCRIPTION='This component provides a products and services catalogue that can be used by a order component in order to provide the products in the orders with better details. The design considerations are given in [DESIGN.md](https://github.com/ConductionNL/productenendienstencatalogus/blob/master/DESIGN.md) and [DESIGN-PDC.md](https://github.com/ConductionNL/productenendienstencatalogus/blob/master/DESIGN-PDC.md)'
 
-
 APP_LOGO=pc.zaakonline.nl
 APP_HOME=pc.zaakonline.nl
 
@@ -73,7 +72,7 @@ CONTAINER_REPRO=https://hub.docker.com/repository/docker/conduction/pdc-php
 ##################################################
 
 NOTIFICATION_ENABLED=falsedxfddxf
-NOTIFICATION_PROVIDER=sasdasd
+NOTIFICATION_PROVIDER=sasdasdtest
 NOTIFICATION_ENABLED_AUTHORIZATION=sasd
 
 ##################################################

.github/workflows/dockerimage.yml

@@ -131,3 +131,29 @@ jobs:
             release_name: ${{ steps.releasecode.outputs.releasename }}
             draft: false
             prerelease: false
+  create_pr:
+    runs-on: ubuntu-latest
+    name: Create Pull-Request on child repositories
+    needs: build
+    if: contains( github.ref, 'master' )
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install hub
+        uses: geertvdc/setup-hub@master
+      - name: GitHub ref
+        run: echo $GITHUB_REF
+      - name: Create PR
+#       run: hub pull-request -b GemeenteUtrecht/productenendienstencatalogus:master -h ConductionNL/productenendienstencatalogus:master -m "$MESSAGE"
+#       run: hub pull-request -b GemeenteUtrecht/productenendienstencatalogus:master -h $GITHUB_REPOSITORY:$GITHUB_REF -m "$MESSAGE"
+        run: |
+          for repo in $REPOS; do
+            hub pull-request -b $repo:master -h $GITHUB_REPOSITORY:master -m "$MESSAGE"
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_CI_TOKEN }}
+          GITHUB_USER: ${{ secrets.GITHUB_CI_USER }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_REF: ${{ github.ref }}
+          HUB_VERBOSE: true
+          MESSAGE: Automated pull request from GitHub Action
+          REPOS: ${{ secrets.REPOS }}

.github/workflows/testpr.yml

@@ -0,0 +1,35 @@
+name: Pull Request Test
+
+on:
+    push:
+        branches:
+            - master
+jobs:
+    create_pr:
+        runs-on: ubuntu-latest
+        name: Create Pull-Request on child repositories
+        #needs: build
+        if: contains( github.ref, 'master' )
+        steps:
+            - uses: actions/checkout@v1
+            - name: Install hub
+              uses: geertvdc/setup-hub@master
+            - name: GitHub ref
+              run: echo $GITHUB_REF
+            - name: Checkout master
+              run: git checkout master
+            - name: Create PR
+#              run: hub pull-request -b GemeenteUtrecht/productenendienstencatalogus:master -h ConductionNL/productenendienstencatalogus:master -m "$MESSAGE"
+#              run: hub pull-request -b GemeenteUtrecht/productenendienstencatalogus:master -h $GITHUB_REPOSITORY:$GITHUB_REF -m "$MESSAGE"
+              run: |
+                for repo in $REPOS; do
+                  hub pull-request -b $repo:master -h $GITHUB_REPOSITORY:master -m "$MESSAGE"
+                done
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_CI_TOKEN }}
+                  GITHUB_USER: ${{ secrets.GITHUB_CI_USER }}
+                  GITHUB_REPOSITORY: ${{ github.repository }}
+                  GITHUB_REF: ${{ github.ref }}
+                  HUB_VERBOSE: true
+                  MESSAGE: Automated pull request from GitHub Action
+                  REPOS: ${{ secrets.REPOS }}

api/config/bundles.php

@@ -1,20 +1,20 @@
 <?php
 
 return [
-    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
-    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
-    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
-    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
-    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
-    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
-    Conduction\CommonGroundBundle\CommonGroundBundle::class => ['all' => true],
-    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
+    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class                    => ['all' => true],
+    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class     => ['all' => true],
+    Symfony\Bundle\SecurityBundle\SecurityBundle::class                      => ['all' => true],
+    Symfony\Bundle\MercureBundle\MercureBundle::class                        => ['all' => true],
+    Symfony\Bundle\TwigBundle\TwigBundle::class                              => ['all' => true],
+    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class                     => ['all' => true],
+    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class          => ['all' => true],
+    Nelmio\CorsBundle\NelmioCorsBundle::class                                => ['all' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class                => ['dev' => true, 'test' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class                            => ['dev' => true],
+    Conduction\CommonGroundBundle\CommonGroundBundle::class                  => ['all' => true],
+    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class        => ['all' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
-    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
-    Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
-    Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class => ['all' => true],
+    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class             => ['all' => true],
+    Tbbc\MoneyBundle\TbbcMoneyBundle::class                                  => ['all' => true],
+    Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class                       => ['all' => true],
 ];

api/helm/values.yaml

@@ -10,7 +10,7 @@ settings:
   version: V.0.1
   description: ''This component provides a products and services catalogue that can be used by a order component in order to provide the products in the orders with better details. The design considerations are given in [DESIGN.md](https://github.com/ConductionNL/productenendienstencatalogus/blob/master/DESIGN.md) and [DESIGN-PDC.md](https://github.com/ConductionNL/productenendienstencatalogus/blob/master/DESIGN-PDC.md)''
   repro: 'https://github.com/ConductionNL/productenendienstencatalogus'
-  domain: conduction.nl  
+  subdomain: pc  
   domains:
     - conduction.nl
     - zaakonline.nl
@@ -28,7 +28,7 @@ settings:
   debug: 1
   replicaCount: 1
   corsAllowOrigin: ['*']
-  trustedHosts: '^(.+\.)?conduction\.nl$|^(.+\.)?vng\.cloud$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost'
+  trustedHosts: '^(.+\.)?conduction\.nl$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost'
   pullPolicy: Always
   # You will need these proxies on kubernetes
   trustedProxies: