it-at-m · ThomasAFink · Sep 10, 2024 · Sep 17, 2024 · Sep 17, 2024 · Sep 17, 2024
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -45,6 +45,8 @@ jobs:
             php_version: "8.0"
           - module: zmscalldisplay
             php_version: "8.0"
+          - module: zmscitizenapi
+            php_version: "8.0"
           - module: zmsmessaging
             php_version: "8.0"
           - module: zmsstatistic

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -27,6 +27,8 @@ jobs:
             php_version: "8.0"
           - module: zmscalldisplay
             php_version: "8.0"
+          - module: zmscitizenapi
+            php_version: "8.0"
           - module: zmsdldb
             php_version: "8.0"
           - module: zmsentities

diff --git a/.htaccess b/.htaccess
@@ -39,6 +39,14 @@ RewriteRule ^terminvereinbarung/calldisplay(.*) /var/www/html/zmscalldisplay/pub
 RewriteRule ^terminvereinbarung/calldisplay/+_(.*) /var/www/html/zmscalldisplay/public/_$1 [QSA]
 
 
+# zmscitizenapi
+SetEnvIf Request_URI ^/zmscitizenapi ZMS_MODULE_BASEPATH=/terminvereinbarung/api/citizen
+RewriteCond %{REQUEST_URI} !^/terminvereinbarung/api/citizen/+(_|doc)
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^terminvereinbarung/api/citizen(.*) /var/www/html/zmscitizenapi/public/index.php?$1 [QSA]
+RewriteRule ^terminvereinbarung/api/citizen/+(doc|_)(.*) /var/www/html/zmscitizenapi/public/$1$2 [QSA]
+
+
 # zmsstatistic
 SetEnvIf Request_URI ^/zmsstatistic ZMS_MODULE_BASEPATH=/terminvereinbarung/statistic
 RewriteCond %{REQUEST_URI} !^/terminvereinbarung/[^/]+/+_

diff --git a/cli b/cli
@@ -22,6 +22,7 @@ modules = [
   "zmsadmin",
   "zmsapi",
   "zmscalldisplay",
+  "zmscitizenapi",
   "zmsclient",
   "zmsdb",
   "zmsdldb",

diff --git a/mellon/phpunit.xml.dist b/mellon/phpunit.xml.dist
@@ -10,7 +10,7 @@
             convertWarningsToExceptions="true"
             processIsolation="false"
             forceCoversAnnotation="false" 
-            stopOnFailure="true"
+            stopOnFailure="false"
             bootstrap="tests/bootstrap.php"
 >
     <testsuites>

diff --git a/zmsadmin/tests/Zmsadmin/fixtures/GET_processList_empty.json b/zmsadmin/tests/Zmsadmin/fixtures/GET_processList_empty.json
@@ -4,7 +4,7 @@
         "$schema": "https://schema.berlin.de/queuemanagement/metaresult.json",
         "error": false,
         "generated": "2019-02-11T16:07:58+01:00",
-        "server": "Zmsapi-ENV (v2.19.02-38-g0ba2cba)"
+        "server": "Zmsapi"
     },
     "data": []
 }
diff --git a/zmsadmin/tests/Zmsadmin/fixtures/GET_processList_fake_entry.json b/zmsadmin/tests/Zmsadmin/fixtures/GET_processList_fake_entry.json
@@ -4,7 +4,7 @@
         "$schema": "https://schema.berlin.de/queuemanagement/metaresult.json",
         "error": false,
         "generated": "2019-02-11T16:07:58+01:00",
-        "server": "Zmsapi-ENV (v2.19.02-38-g0ba2cba)"
+        "server": "Zmsapi"
     },
     "data": [
         {

diff --git a/zmsadmin/tests/Zmsadmin/fixtures/GET_source_unittest.json b/zmsadmin/tests/Zmsadmin/fixtures/GET_source_unittest.json
@@ -4,7 +4,7 @@
         "$schema": "https://schema.berlin.de/queuemanagement/metaresult.json",
         "error": false,
         "generated": "2019-02-08T14:45:15+01:00",
-        "server": "Zmsapi-ENV (v2.19.02-38-g0ba2cba)"
+        "server": "Zmsapi"
     },
     "data": {
         "$schema": "https://schema.berlin.de/queuemanagement/source.json",

diff --git a/zmsapi/public/doc/README.md b/zmsapi/public/doc/README.md
@@ -1,6 +1,22 @@
 ## How does the Open Api definition work
 ## Version 2.0
 
+```
+bin/configure
+npm i
+npm run build
+npm run doc
+swagger-cli bundle -o public/doc/swagger.json public/doc/swagger.yaml
+python3 -m http.server 8001
+```
+
+Reachable at:
+```
+http://[::]:8001/public/doc/
+https://zms.ddev.site/terminvereinbarung/api/2/doc/index.html
+https://it-at-m.github.io/eappointment/zmsapi/public/doc/index.html
+```
+
 * Under /public/doc are the schema from zmsentities. A symbolic link points to the corresponding folder under vendor/eappointment/zmsentities/schema.
 
 * Under /bin there is a build_swagger.js file. This is executed via ``npm run doc`` and validates the existing swagger.yaml file. If valid, the open api annotations are read from routing.php and the remaining information such as info, definitions, version and tags are compiled from the yaml files under ./partials into a complete swagger.yaml. 

diff --git a/zmscalldisplay/package-lock.json b/zmscalldisplay/package-lock.json
diff --git a/zmscalldisplay/phpunit.xml b/zmscalldisplay/phpunit.xml
@@ -10,7 +10,7 @@
   convertNoticesToExceptions="true" 
   convertWarningsToExceptions="true" 
   forceCoversAnnotation="false" 
-  stopOnFailure="true" 
+  stopOnFailure="false" 
   verbose="true"
   processIsolation="false"
 >

diff --git a/zmscitizenapi/.gitignore b/zmscitizenapi/.gitignore
@@ -0,0 +1,17 @@
+node_modules
+vendor
+vendor.zmsbase
+config.php
+tags
+.DS_*
+public/_tests
+public/doc/assets/redoc.min.js
+public/doc/swagger.*
+public/_test/assets/swagger-ui-bundle.js
+public/_test/assets/swagger-ui.css
+public/_test/assets/swagger-ui-standalone-preset.js
+cache
+vendor.old
+vendor.update
+VERSION
+.phpunit.result.cache
diff --git a/zmscitizenapi/Makefile b/zmscitizenapi/Makefile
@@ -0,0 +1,32 @@
+.PHONY: help now dev live watch fix openapi coverage paratest
+
+help: # This help
+	@echo "Possible Targets:"
+	@grep -P "^\w+:" Makefile|sort|perl -pe 's/^(\w+):([^\#]+)(\#\s*(.*))?/ \1\n\t\4\n/'
+
+now: # Dummy target
+
+dev: # init development system
+	COMPOSER=composer.json composer update
+	npm install
+
+live: # init live system, delete unnecessary libs
+	composer install --no-dev --prefer-dist
+	bin/configure
+	npm install
+	npm run build
+	npm run doc
+	npx swagger-cli bundle -o public/doc/swagger.json public/doc/swagger.yaml
+
+fix: # run code fixing
+	php vendor/bin/phpcbf --standard=psr2 src/
+	php vendor/bin/phpcbf --standard=psr2 tests/
+
+openapi: # Swagger docs on changes
+	./bin/doc
+
+coverage:
+	php vendor/bin/phpunit --coverage-html public/_tests/coverage/
+
+paratest: # init parallel unit testing with 5 processes
+	vendor/bin/paratest -p20 --coverage-html public/_tests/coverage/