@superhero/eventflow-db 4.1.3 → 4.2.0

package/index.js

@@ -270,32 +270,51 @@ export default class DB
     return result
   }
 
-  async persistEventCpid(event_id, cpid)
+  async readEventsByDomainAndPidAndNames(domain, pid, names)
   {
+    let result
+
     try
     {
-      const result = await this.gateway.query('event_cpid/persist', [ event_id, cpid ])
+      result = await this.gateway.query('event/read-by-pid-domain-names', [ pid, domain, names ])
+    }
+    catch(reason)
+    {
+      const error = new Error(`could not read event by pid: ${pid} and domain: ${domain}`)
+      error.code  = 'E_EVENTFLOW_DB_EVENT_READ_BY_PID'
+      error.cause = reason
+      throw error
+    } 
+
+    return result
+  }
+
+  async persistEventCpid(event_id, domain, cpid)
+  {
+    try
+    {
+      const result = await this.gateway.query('event_cpid/persist', [ event_id, domain, cpid ])
       return result.affectedRows > 0
     }
     catch(reason)
     {
-      const error = new Error(`Could not persist event (${event_id}) and cpid (${cpid}) association`)
+      const error = new Error(`Could not persist event (${event_id}) and cpid (${domain} › ${cpid}) association`)
       error.code  = 'E_EVENTFLOW_DB_EVENT_CPID_PERSIST'
       error.cause = reason
       throw error
-    } 
+    }
   }
 
-  async deleteEventCpid(event_id, cpid)
+  async deleteEventCpid(event_id, domain, cpid)
   {
     try
     {
-      const result = await this.gateway.query('event_cpid/delete', [ event_id, cpid ])
+      const result = await this.gateway.query('event_cpid/delete', [ event_id, domain, cpid ])
       return result.affectedRows > 0
     }
     catch(reason)
     {
-      const error = new Error(`Could not delete event (${event_id}) and cpid (${cpid}) association`)
+      const error = new Error(`Could not delete event (${event_id}) and cpid (${domain} › ${cpid}) association`)
       error.code  = 'E_EVENTFLOW_DB_EVENT_CPID_DELETE'
       error.cause = reason
       throw error
@@ -318,7 +337,7 @@ export default class DB
       throw error
     } 
 
-    return result.map((row) => row.cpid)
+    return result.map(({ domain, cpid }) => ({ domain, cpid }))
   }
 
   async readEventsByDomainAndCpid(domain, cpid)
@@ -329,7 +348,7 @@ export default class DB
     }
     catch(reason)
     {
-      const error = new Error(`could not read events by domain: ${domain} and cpid: ${cpid}`)
+      const error = new Error(`could not read events by: ${domain} › ${cpid}`)
       error.code  = 'E_EVENTFLOW_DB_EVENT_BY_DOMAIN_AND_CPID_READ'
       error.cause = reason
       throw error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/eventflow-db",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "description": "Eventflow db is a set of common database logic in the eventflow ecosystem.",
   "keywords": [
     "eventflow"
@@ -15,7 +15,7 @@
     "@superhero/db": "^0.5.0"
   },
   "devDependencies": {
-    "@superhero/locator": "4.2.2"
+    "@superhero/locator": "4.2.3"
   },
   "scripts": {
     "test-build": "docker ps -q -f name=eventflow-mysql | grep -q . && docker stop eventflow-mysql; docker run --rm --name eventflow-mysql -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=eventflow -p 3306:3306 --health-cmd=\"mysqladmin ping -h 127.0.0.1 -uroot -proot --silent || exit 1\" --health-interval=10s --health-timeout=5s --health-retries=5 -d mysql:latest; until [ \"$(docker inspect --format='{{.State.Health.Status}}' eventflow-mysql)\" == \"healthy\" ]; do sleep 1; done",

package/sql/event/read-by-pid-domain-names.sql

@@ -0,0 +1,5 @@
+SELECT *
+FROM event
+WHERE pid    = ?
+  AND domain = ?
+  AND name  IN (?)

package/sql/event_cpid/schema.sql

@@ -1,12 +1,13 @@
 CREATE TABLE IF NOT EXISTS event_cpid 
 (
   event_id  VARCHAR(64) NOT NULL,
+  domain    VARCHAR(64) NOT NULL,
   cpid      VARCHAR(64) NOT NULL,
 
-  PRIMARY KEY (event_id, cpid),
+  PRIMARY KEY (event_id, domain, cpid),
   FOREIGN KEY (event_id) REFERENCES event (id)
     ON UPDATE CASCADE
     ON DELETE CASCADE,
-  INDEX idx_cpid (cpid)
+  INDEX idx_domain_cpid (domain, cpid)
 )
 ENGINE=InnoDB