restart

Author: killua-eu

README.md

@@ -40,6 +40,9 @@ Schemes and kinds
 - phone
 - regid - ičo
 - vatid - dič
+- name
+  - kind:natural
+  - kind:legal
 - vat_payer - současný stav + historie
 - payroll
   - object:nationality (string - countrycode)
@@ -229,3 +232,18 @@ SELECT JSON_OBJECTAGG(uuid,data) as data from (
 As of current (MySQL v 8.0.31), the database builtin function `JSON_REMOVE` will
 not accept a wildcard in the jsonpath. Hence, removing metadata to lighten the
 json response is done PHP side via https://github.com/Galbar/JsonPath-PHP.
+
+## Sample data
+
+```sql
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "uri", "_v": 1, "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/t1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "website", "uuid": "17c9eb5c-d9d0-4701-aec5-9c25a5c1d020", "value": "https://vaizard.org"}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "name", "_v": 1, "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/t1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "natural", "uuid": "9a4d54b3-d7c1-46dd-9ba3-acfb19537bad", "given": "Igor", "label": null, "value": "Mgr. Igor Hnizdo, MSc.", "family": "Hnizdo", "prefix": "Mgr.", "suffix": "MSc."}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "name", "_v": 1, "_iat": 1673721912, "_iss": "https://wwwinfo.mfcr.cz/ares/ares_es.html.cz", "_sub": "bac72087-73e4-48ed-9f27-e51c531e42bb", "kind": "legal", "uuid": "bacd54b3-d7c1-46dd-9ba3-acfb19537bad", "value": "Bauhaus, k.s."}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "email", "_v": 1, "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/t1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "uuid": "fd2f47b6-ae0a-46ec-91f6-8dcbd7294ff4", "label": null, "value": "igor@example.com", "_primary": 1}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "phone", "_v": 1, "_iat": 1673721512, "_iss": "https://example.com/", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "uuid": "fd2f47b6-ae0a-46ec-91f6-8dcbd7294ff4", "label": null, "value": "+4207123456"}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "service", "_v": 1, "uri": "https://id.example.com/auth/realms/example1", "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/example1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "oidc", "uuid": "3d2c1354-9931-4af4-a2e4-02257d4f7e1c", "value": "https://id.example.com/auth/realms/example1/igorh", "handle": "igorh"}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "address", "_v": 1, "cc": "CZ", "zip": "61500", "_iat": 1673721512, "_iss": "https://glued.example.com/api/users/v1/pupen", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "main", "unit": "Studio 13", "uuid": "432c1aaa-1131-abf4-b2eb-537b7d4f7111", "extra": "Béžová budova naproti výtopně", "floor": "1", "pobox": "123", "value": "Studio 13, 1. podlaží, Budova č. 76 - Industra Labs, Lazaretní 1/7, Brno-Židenice, Brno-Město, Jihomoravský kraj, 61500, CZ", "region": "Jihomoravský kraj", "street": "Lazaretní", "quarter": "Židenice", "district": "Brno-Město", "locacity": "Brno", "conscr_no": "1", "street_no": "7", "building_no": "76", "building_name": "Industra Labs"}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "natid", "_v": 1, "icc": "CZ", "num": "901111/3452", "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/t1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "CZ", "uuid": "fabd07f8-5005-43d6-9fd2-0a71511478c9", "value": "901111/3452"}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "vatid", "_v": 1, "icc": "CZ", "num": "CZ29228107", "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/t1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "CZ", "uuid": "e974af5c-afb0-4817-9f33-9a9d25839ab2", "value": "CZ29228107"}');
+INSERT INTO glued.t_contacts_atoms (c_data) VALUES ('{"_s": "regid", "_v": 1, "icc": "CZ", "num": "29228107", "_iat": 1673721512, "_iss": "https://id.example.com/auth/realms/t1", "_sub": "7e172087-73e4-48ed-9f27-e51c531e42bb", "kind": "CZ", "uuid": "af5ce974-fbb0-4817-339f-d25839ab29a9", "value": "29228107"}');
+```

composer.json

@@ -9,7 +9,7 @@
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-apcu": "*",
     "ext-bcmath": "*",
     "ext-curl": "*",
@@ -21,54 +21,44 @@
     "ext-mysqli": "*",
     "ext-readline": "*",
     "ext-soap": "*",
+    "ext-sodium": "*",
     "ext-xml": "*",
+    "casbin/database-adapter": "^1",
     "facile-it/php-openid-client": "dev-master",
-    "foxy/foxy": "^v1.2.1",
+    "galbar/jsonpath": "^3",
     "geocoder-php/geoip2-provider": "^4",
-    "guzzlehttp/psr7": "^1",
+    "grasmash/yaml-expander": "^3",
+    "guzzlehttp/psr7": "^2",
     "http-interop/http-factory-guzzle": "^1",
+    "keiko/uuid-shortener": "^1",
     "league/flysystem": "^3",
     "middlewares/trailing-slash": "^2",
-    "monolog/monolog": "^2",
+    "monolog/monolog": "^3",
     "nyholm/psr7": "^1",
     "opis/json-schema": "^2",
-    "php-di/php-di": "^6",
+    "php-di/php-di": "^7",
     "php-http/guzzle7-adapter": "^1",
     "php-http/message": "^1",
     "phpfastcache/phpfastcache": "^9",
-    "sabre/event": "^5",
+    "ramsey/uuid": "^4",
+    "sabre/event": "^6",
+    "selective/transformer": "^1",
+    "shuchkin/simplexlsxgen": "^1.2",
     "slim/http": "^1",
     "slim/slim": "^4",
+    "symfony/config": "^6",
     "symfony/mailer": "^6",
-    "symfony/yaml": "^5",
+    "symfony/yaml": "^6",
     "thingengineer/mysqli-database-class": "dev-master#42116651a88b57b03fd967bc57dd38f5094565d9",
-    "tuupola/slim-jwt-auth": "^3",
-    "voku/anti-xss": "^4",
-    "zeuxisoo/slim-whoops": "^0.7",
-    "symfony/config": "^5",
-    "selective/transformer": "^1",
-    "casbin/database-adapter": "^1",
-    "ramsey/uuid": "^4",
     "vaizard/glued-lib": "dev-main",
-    "grasmash/yaml-expander": "^3",
     "vlucas/phpdotenv": "^5",
-    "keiko/uuid-shortener": "^0.6.1",
-    "shuchkin/simplexlsxgen": "^1.2",
-    "youthweb/urllinker": "^1.4",
-    "galbar/jsonpath": "^2.1"
-  },
-  "suggest": {
-    "ext-xdebug": "For dev only"
+    "zeuxisoo/slim-whoops": "^0.7"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2"
   },
-  "autoload": {
-    "psr-4": {
-      "Glued\\": "glued/"
-    },
-    "files": [
-    ]
+  "suggest": {
+    "ext-xdebug": "For dev only"
   },
   "repositories": [
     {
@@ -79,7 +69,30 @@
   ],
   "minimum-stability": "beta",
   "prefer-stable": true,
+  "autoload": {
+    "psr-4": {
+      "Glued\\": "glued/"
+    },
+    "files": []
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true,
+      "foxy/foxy": true,
+      "php-http/discovery": true
+    }
+  },
   "scripts": {
+    "post-install-cmd": [
+      "composer configure || echo \"[FAIL] Failed to configure glued. Please make sure all env variables are set. Rerun composer configure.\"",
+      "composer migrate",
+      "echo \"Run 'composer nginx' manually to pick restart this microservice\""
+    ],
+    "post-update-cmd": [
+      "composer configure || echo \"[FAIL] Failed to configure glued. Please make sure all env variables are set. Rerun composer configure.\"",
+      "composer migrate",
+      "echo \"Run 'composer nginx' manually to pick restart this microservice\""
+    ],
     "backup": [
       "vendor/vaizard/glued-lib/src/Scripts/backup.sh"
     ],
@@ -95,29 +108,18 @@
       "vendor/vaizard/glued-lib/src/Scripts/migrate.sh"
     ],
     "nginx": [
+      "patch -s --reject-file=/dev/null -p1 vendor/monolog/monolog/src/Monolog/Logger.php < vendor/vaizard/glued-lib/src/Patches/Logger.patch",
       "vendor/vaizard/glued-lib/src/Scripts/nginx.sh",
       "Glued\\Lib\\ComposerHooks::generateNginx",
-      "vendor/vaizard/glued-lib/src/Scripts/nginx-reload.sh"
-    ],
-    "post-install-cmd": [
-      "composer configure || echo \"[FAIL] Failed to configure glued. Please make sure all env variables are set. Rerun composer configure.\"",
-      "composer migrate",
-      "echo \"Run 'composer nginx' manually to pick restart this microservice\""
-    ],
-    "post-update-cmd": [
-      "composer configure || echo \"[FAIL] Failed to configure glued. Please make sure all env variables are set. Rerun composer configure.\"",
-      "composer migrate",
-      "echo \"Run 'composer nginx' manually to pick restart this microservice\""
+      "vendor/vaizard/glued-lib/src/Scripts/nginx-reload.sh",
+      "vendor/vaizard/glued-lib/src/Scripts/php-fpm.sh",
+      "Glued\\Lib\\ComposerHooks::generatePHPFPM",
+      "vendor/vaizard/glued-lib/src/Scripts/php-fpm-reload.sh",
+      "patch -Rs --reject-file=/dev/null -p1 vendor/monolog/monolog/src/Monolog/Logger.php < vendor/vaizard/glued-lib/src/Patches/Logger.patch"
     ],
     "settings": [
       "Glued\\Lib\\ComposerHooks::PrintSettings"
     ],
     "start": "php -S localhost:8080 -t public"
-  },
-  "config": {
-    "allow-plugins": {
-      "ergebnis/composer-normalize": true,
-      "foxy/foxy": true
-    }
   }
 }

glued/Config/Migrations/20230121131601_contacts_atoms.sql

@@ -0,0 +1,32 @@
+-- migrate:up
+
+CREATE TABLE `t_contacts_objects` (
+  `c_uuid` binary(16) NOT NULL COMMENT 'Object UUID',
+  `c_rev` int unsigned NOT NULL DEFAULT '0' COMMENT 'Object revision',
+  `c_data` json DEFAULT NULL COMMENT 'Object data as JSON',
+  `c_private` bit(1) NOT NULL DEFAULT b'0' COMMENT 'Exclude private data from ft search',
+  `c_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Timestamp column',
+  `c_ft` text COMMENT 'Fulltext search',
+  `c_hash` binary(16) GENERATED ALWAYS AS (unhex(md5(`c_data`))) STORED,
+  PRIMARY KEY (`c_uuid`),
+  UNIQUE KEY `idx_c_hash` (`c_hash`),
+  FULLTEXT KEY `idx_c_ft` (`c_ft`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+
+CREATE TABLE `t_contacts_objects_refs` (
+  `obj` binary(16) NOT NULL COMMENT 'Object UUID',
+  `ref_label` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '_' COMMENT 'Reference label',
+  `ref_val` binary(16) NOT NULL COMMENT 'Reference UUID',
+  `ref_kind` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Reference kind',
+  `ref_from` timestamp NULL DEFAULT NULL COMMENT 'Reference valid from',
+  `ref_until` timestamp NULL DEFAULT NULL COMMENT 'Reference valid until',
+  PRIMARY KEY (`obj`,`ref_label`,`ref_kind`,`ref_val`),
+  KEY `obj` (`obj`),
+  KEY `obj_obj_generation` (`obj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='References between objects';
+
+-- migrate:down
+
+DROP TABLE IF EXISTS `t_contacts_objects`;
+DROP TABLE IF EXISTS `t_contacts_objects_refs`;

glued/Config/Migrations/20240122121841_init.sql

@@ -17,8 +17,8 @@ routes:
     #########################################################
 
     be_contacts_health_v1:
-        pattern:    ${routes.be_contacts.path}/health/v1
-        path:       ${routes.be_contacts.path}/health/v1
+        pattern:    ${routes.be_contacts.path}/v1/health
+        path:       ${routes.be_contacts.path}/v1/health
         label:      contacts health
         dscr:       A healthcheck endpoint for the microservice.
         service:    contacts
@@ -31,32 +31,29 @@ routes:
   #########################################################
 
     be_contacts_v1:
-      pattern:    ${routes.be_contacts.path}/v1
-      path:       ${routes.be_contacts.path}/v1
+      pattern:    ${routes.be_contacts.path}/v1/objects[/{uuid}]
+      path:       ${routes.be_contacts.path}/v1/objects
       label:      Contacts
       dscr:       Address book.
       service:    contacts
       methods:
         get:    Glued\Controllers\ServiceController:contacts_r1
-        post:   Glued\Controllers\ServiceController:contacts_cu1
-        put:    Glued\Controllers\ServiceController:contacts_cu1
-        patch:  Glued\Controllers\ServiceController:contacts_cu1
-        delete: Glued\Controllers\ServiceController:contacts_d1
-
-    be_contacts_rels_v1:
-      pattern:    ${routes.be_contacts.path}/rels/v1
-      path:       ${routes.be_contacts.path}/rels/v1
-      label:      Relationships
-      dscr:       Relationships between persons.
+        post:   Glued\Controllers\ServiceController:contacts_p1
+
+    be_contacts_refs_v1:
+      pattern:    ${routes.be_contacts.path}/v1/{uuid}/refs
+      path:       ${routes.be_contacts.path}/v1/refs
+      label:      References
+      dscr:       Relationship references between contact objects.
       service:    contacts
       methods:
-        get:    Glued\Controllers\ServiceController:rels_r1
+        get:    Glued\Controllers\ServiceController:refs_r1
 
-    be_contacts_regs_v1:
-      pattern:    ${routes.be_contacts.path}/regs/v1
-      path:       ${routes.be_contacts.path}/regs/v1
-      label:      Registers
-      dscr:       Fetching data from registers.
+    be_contacts_import_v1:
+      pattern:    ${routes.be_contacts.path}/v1/import/{act}/{key}
+      path:       ${routes.be_contacts.path}/v1/import
+      label:      Import
+      dscr:       Address book.
       service:    contacts
       methods:
-        get:    Glued\Controllers\ServiceController:regs_r1
+        get:    Glued\Controllers\ServiceController:import_r1