fix: update /:id/event-aggregates db queries

Author: samparsky

Cargo.lock

@@ -20,7 +20,7 @@ lazy_static! {
         ids.insert("user".into(), ValidatorId::try_from("0x20754168c00a6e58116ccfd0a5f7d1bb66c5de9d").expect("failed to parse id"));
         ids.insert("publisher".into(), ValidatorId::try_from("0xb7d3f81e857692d13e9d63b232a90f4a1793189e").expect("failed to parse id"));
         ids.insert("publisher2".into(), ValidatorId::try_from("0x2054b0c1339309597ad04ba47f4590f8cdb4e305").expect("failed to parse id"));
-        ids.insert("creator".into(), ValidatorId::try_from("0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359").expect("failed to parse id"));
+        ids.insert("creator".into(), ValidatorId::try_from("0x033ed90e0fec3f3ea1c9b005c724d704501e0196").expect("failed to parse id"));
         ids.insert("tester".into(), ValidatorId::try_from("0x2892f6C41E0718eeeDd49D98D648C789668cA67d").expect("failed to parse id"));
 
         ids

primitives/src/util/tests/prep_db.rs

@@ -0,0 +1 @@
+DELETE FROM channels;

sentry/migrations/20190806011140_initial-tables/seed/down.sql

@@ -0,0 +1,11 @@
+INSERT INTO 
+channels 
+VALUES 
+(
+    '0x061d5e2a67d0a9a10f1c732bca12a676d83f79663a396f7d87b3e30b9b411088', 
+    '0x033ed90e0fec3f3ea1c9b005c724d704501e0196', 
+    '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359', 
+    '1000',
+    to_timestamp(4102444800000),
+    '{"minPerImpression":"1","maxPerImpression":"10","pricingBounds":{"CLICK":{"min":"0","max":"0"}},"withdrawPeriodStart":4073414400000,"validators":[{"id":"0xce07CbB7e054514D590a0262C93070D838bFBA2e","url":"http://localhost:8005","fee":"100"},{"id":"0xC91763D7F14ac5c5dDfBCD012e0D2A61ab9bDED3","url":"http://localhost:8006","fee":"100"}]}'
+);

sentry/migrations/20190806011140_initial-tables/seed/up.sql

@@ -30,10 +30,17 @@ CREATE TABLE event_aggregates
     channel_id VARCHAR(66)              NOT NULL REFERENCES channels (id) ON DELETE RESTRICT,
     created    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
     event_type VARCHAR(255)             NOT NULL,
-    earner     VARCHAR(255)                    ,
+    earner     VARCHAR(255),
     event_counts VARCHAR                   NOT NULL,
-    event_payouts VARCHAR                  NOT NULL,
+    event_payouts VARCHAR                  NOT NULL
 );
 
 CREATE INDEX idx_event_aggregates_created ON event_aggregates (created);
-CREATE INDEX idx_event_aggregates_channel ON event_aggregates (created);
+CREATE INDEX idx_event_aggregates_channel ON event_aggregates (channel_id);
+CREATE INDEX idx_event_aggregates_event_type ON event_aggregates (event_type);
+
+CREATE AGGREGATE jsonb_object_agg(jsonb) (
+  SFUNC = 'jsonb_concat',
+  STYPE = jsonb,
+  INITCOND = '{}'
+);

sentry/migrations/20190806011140_initial-tables/up.sql

@@ -84,7 +84,7 @@ pub async fn check_access(
         .as_ref()
         .map(|ev_sub| ev_sub.allow.as_slice())
         .unwrap_or_else(|| &default_rules);
-
+    
     // first, find an applicable access rule
     let rules = allow_rules
         .iter()

sentry/src/access.rs

@@ -55,7 +55,7 @@ pub async fn postgres_connection() -> Result<DbPool, bb8_postgres::tokio_postgre
     Pool::builder().build(pg_mgr).await
 }
 
-pub async fn setup_migrations() {
+pub async fn setup_migrations(environment: &str) {
     use migrant_lib::{Config, Direction, Migrator, Settings};
 
     let settings = Settings::configure_postgres()
@@ -82,9 +82,18 @@ pub async fn setup_migrations() {
         };
     }
 
+    let mut migrations = vec![
+        make_migration!("20190806011140_initial-tables")
+    ];
+
+    if environment == "development" {
+        // seeds database tables for testing
+        migrations.push(make_migration!("20190806011140_initial-tables/seed"))
+    }
+
     // Define Migrations
     config
-        .use_migrations(&[make_migration!("20190806011140_initial-tables")])
+        .use_migrations(&migrations.as_slice())
         .expect("Loading migrations failed");
 
     // Reload config, ping the database for applied migrations