From 13f7ae48bb58a73b5e82bc0a8955e07829c91850 Mon Sep 17 00:00:00 2001
From: Jacob Bare <jacob@limit0.io>
Date: Fri, 18 Jan 2019 11:52:40 -0600
Subject: [PATCH] Add new event models

---
 services/graphql/src/mongoose/models/click.js    |  4 ++++
 services/graphql/src/mongoose/models/event.js    |  4 ----
 services/graphql/src/mongoose/models/index.js    |  8 ++++++--
 services/graphql/src/mongoose/models/request.js  |  4 ++++
 services/graphql/src/mongoose/models/view.js     |  4 ++++
 .../src/mongoose/schema/{event.js => click.js}   | 14 ++++++--------
 .../graphql/src/mongoose/schema/correlator.js    |  1 +
 services/graphql/src/mongoose/schema/request.js  | 12 ++++++++++++
 services/graphql/src/mongoose/schema/view.js     | 16 ++++++++++++++++
 9 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 services/graphql/src/mongoose/models/click.js
 delete mode 100644 services/graphql/src/mongoose/models/event.js
 create mode 100644 services/graphql/src/mongoose/models/request.js
 create mode 100644 services/graphql/src/mongoose/models/view.js
 rename services/graphql/src/mongoose/schema/{event.js => click.js} (60%)
 create mode 100644 services/graphql/src/mongoose/schema/request.js
 create mode 100644 services/graphql/src/mongoose/schema/view.js

diff --git a/services/graphql/src/mongoose/models/click.js b/services/graphql/src/mongoose/models/click.js
new file mode 100644
index 0000000..44e7aed
--- /dev/null
+++ b/services/graphql/src/mongoose/models/click.js
@@ -0,0 +1,4 @@
+const connection = require('../connections/account');
+const schema = require('../schema/click');
+
+module.exports = connection.model('click', schema);
diff --git a/services/graphql/src/mongoose/models/event.js b/services/graphql/src/mongoose/models/event.js
deleted file mode 100644
index 08edbfc..0000000
--- a/services/graphql/src/mongoose/models/event.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const connection = require('../connections/account');
-const schema = require('../schema/event');
-
-module.exports = connection.model('event', schema);
diff --git a/services/graphql/src/mongoose/models/index.js b/services/graphql/src/mongoose/models/index.js
index ebbb387..7935bfb 100644
--- a/services/graphql/src/mongoose/models/index.js
+++ b/services/graphql/src/mongoose/models/index.js
@@ -2,26 +2,30 @@ const account = require('./account');
 const ad = require('./ad');
 const adunit = require('./adunit');
 const advertiser = require('./advertiser');
+const click = require('./click');
 const correlator = require('./correlator');
 const deployment = require('./deployment');
-const event = require('./event');
 const lineitem = require('./lineitem');
 const order = require('./order');
 const publisher = require('./publisher');
+const request = require('./request');
 const schedule = require('./schedule');
 const user = require('./user');
+const view = require('./view');
 
 module.exports = {
   account,
   ad,
   adunit,
   advertiser,
+  click,
   correlator,
   deployment,
-  event,
   lineitem,
   order,
   publisher,
+  request,
   schedule,
   user,
+  view,
 };
diff --git a/services/graphql/src/mongoose/models/request.js b/services/graphql/src/mongoose/models/request.js
new file mode 100644
index 0000000..38f4358
--- /dev/null
+++ b/services/graphql/src/mongoose/models/request.js
@@ -0,0 +1,4 @@
+const connection = require('../connections/account');
+const schema = require('../schema/request');
+
+module.exports = connection.model('request', schema);
diff --git a/services/graphql/src/mongoose/models/view.js b/services/graphql/src/mongoose/models/view.js
new file mode 100644
index 0000000..8f8edf8
--- /dev/null
+++ b/services/graphql/src/mongoose/models/view.js
@@ -0,0 +1,4 @@
+const connection = require('../connections/account');
+const schema = require('../schema/view');
+
+module.exports = connection.model('view', schema);
diff --git a/services/graphql/src/mongoose/schema/event.js b/services/graphql/src/mongoose/schema/click.js
similarity index 60%
rename from services/graphql/src/mongoose/schema/event.js
rename to services/graphql/src/mongoose/schema/click.js
index f890f7b..2b2e297 100644
--- a/services/graphql/src/mongoose/schema/event.js
+++ b/services/graphql/src/mongoose/schema/click.js
@@ -1,18 +1,16 @@
 const { Schema } = require('mongoose');
 
 const schema = new Schema({
-  correlator: String,
-  type: String,
-  count: Number,
   adId: Schema.Types.ObjectId,
-  adUnitId: Schema.Types.ObjectId,
+  lineitemId: Schema.Types.ObjectId,
+  orderId: Schema.Types.ObjectId,
   advertiserId: Schema.Types.ObjectId,
+  adunitId: Schema.Types.ObjectId,
   deploymentId: Schema.Types.ObjectId,
-  lineItemId: Schema.Types.ObjectId,
-  orderId: Schema.Types.ObjectId,
   publisherId: Schema.Types.ObjectId,
+  date: Date,
+  email: String,
+  send: String,
 });
 
-schema.index({ correlator: 1, type: 1, count: 1 });
-
 module.exports = schema;
diff --git a/services/graphql/src/mongoose/schema/correlator.js b/services/graphql/src/mongoose/schema/correlator.js
index dbb032a..16830cc 100644
--- a/services/graphql/src/mongoose/schema/correlator.js
+++ b/services/graphql/src/mongoose/schema/correlator.js
@@ -5,6 +5,7 @@ const schema = new Schema({
   src: String,
   url: String,
   adId: Schema.Types.ObjectId,
+  lineitemId: Schema.Types.ObjectId,
 });
 
 schema.index({ value: 1 }, { unique: true });
diff --git a/services/graphql/src/mongoose/schema/request.js b/services/graphql/src/mongoose/schema/request.js
new file mode 100644
index 0000000..e33d974
--- /dev/null
+++ b/services/graphql/src/mongoose/schema/request.js
@@ -0,0 +1,12 @@
+const { Schema } = require('mongoose');
+
+const schema = new Schema({
+  adunitId: Schema.Types.ObjectId,
+  deploymentId: Schema.Types.ObjectId,
+  publisherId: Schema.Types.ObjectId,
+  date: Date,
+  email: String,
+  send: String,
+});
+
+module.exports = schema;
diff --git a/services/graphql/src/mongoose/schema/view.js b/services/graphql/src/mongoose/schema/view.js
new file mode 100644
index 0000000..2b2e297
--- /dev/null
+++ b/services/graphql/src/mongoose/schema/view.js
@@ -0,0 +1,16 @@
+const { Schema } = require('mongoose');
+
+const schema = new Schema({
+  adId: Schema.Types.ObjectId,
+  lineitemId: Schema.Types.ObjectId,
+  orderId: Schema.Types.ObjectId,
+  advertiserId: Schema.Types.ObjectId,
+  adunitId: Schema.Types.ObjectId,
+  deploymentId: Schema.Types.ObjectId,
+  publisherId: Schema.Types.ObjectId,
+  date: Date,
+  email: String,
+  send: String,
+});
+
+module.exports = schema;