Revert "Merge branch 'feature-MPDZBS-877-zmscitizenapi' into next"

This reverts commit 5e9bc0d, reversing changes made to e6c5a90.
it-at-m · Sep 10, 2024 · c672cbe · c672cbe
1 parent 5e9bc0d
commit c672cbe
Show file tree

Hide file tree

Showing 98 changed files with 2 additions and 14,243 deletions.
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -45,8 +45,6 @@ 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/static.yaml b/.github/workflows/static.yaml
@@ -88,4 +88,4 @@ jobs:
       # Step 11: Deploy to GitHub Pages
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -27,8 +27,6 @@ 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,14 +39,6 @@ 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,7 +22,6 @@ modules = [
   "zmsadmin",
   "zmsapi",
   "zmscalldisplay",
-  "zmscitizenapi",
   "zmsclient",
   "zmsdb",
   "zmsdldb",

diff --git a/zmsadmin/src/Zmsadmin/TicketprinterConfig.php b/zmsadmin/src/Zmsadmin/TicketprinterConfig.php
@@ -72,4 +72,4 @@ public function readResponse(
             )
         );
     }
-}
+}
diff --git a/zmsapi/Makefile b/zmsapi/Makefile
@@ -12,11 +12,6 @@ dev: # init development system
 
 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/

diff --git a/zmsapi/public/doc/README.md b/zmsapi/public/doc/README.md
@@ -1,22 +1,6 @@
 ## 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
-```
-
-
 * 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/zmsapi/src/Zmsapi/ProcessFree.php b/zmsapi/src/Zmsapi/ProcessFree.php
@@ -38,7 +38,6 @@ public function readResponse(
             ->readFreeProcesses($calendar, \App::getNow(), $slotType, $slotsRequired, $groupData ? true: false)
             ->withLessData($keepLessData)
         ;
-
         if ($groupData && count($processList) >= $groupData) {
             $processList = $processList->withUniqueScope(true);
         } elseif ($groupData) {

diff --git a/zmscitizenapi/.gitignore b/zmscitizenapi/.gitignore
diff --git a/zmscitizenapi/Makefile b/zmscitizenapi/Makefile
diff --git a/zmscitizenapi/VERSION b/zmscitizenapi/VERSION
diff --git a/zmscitizenapi/bin/build_swagger.js b/zmscitizenapi/bin/build_swagger.js
diff --git a/zmscitizenapi/bin/configure b/zmscitizenapi/bin/configure
diff --git a/zmscitizenapi/bootstrap.php b/zmscitizenapi/bootstrap.php
diff --git a/zmscitizenapi/composer.json b/zmscitizenapi/composer.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,4 +72,4 @@ public function readResponse( @@
                 )
             );
         }
-    }
+    }