Merge pull request #48 from Bitstackers/issue-47

Merge new message model

Author: rostgaard

bin/messagedispatcher.dart

@@ -51,20 +51,15 @@ void main(List<String> args) {
     log.shout(error, stackTrace);
   }
 }
+//
+///**
+// *
+// */
+//List<Model.MessageEndpoint> emailEndpoints(List<Model.MessageEndpoint> endpoints) =>
+//    endpoints.where((Model.MessageEndpoint endpoint) =>
+//        endpoint.type == Model.MessageEndpointType.EMAIL).toList();
+//
 
-/**
- *
- */
-List<Model.MessageEndpoint> emailEndpoints(List<Model.MessageEndpoint> endpoints) =>
-    endpoints.where((Model.MessageEndpoint endpoint) =>
-        endpoint.type == Model.MessageEndpointType.EMAIL).toList();
-
-/**
- *
- */
-List<Model.MessageRecipient> emailRecipients(Model.Message message) =>
-    message.recipients.where((Model.MessageRecipient recipient) =>
-        recipient.endpoints.contains(Model.MessageEndpointType.EMAIL)).toList();
 
 /**
  * The Periodic task that passes emails on to the SMTP server.
@@ -76,7 +71,7 @@ void periodicEmailSend() {
   Router.messageQueueStore.list(maxTries : msgdisp.config.maxTries).then((List<Model.MessageQueueItem> queuedMessages) {
     Future.forEach(queuedMessages, tryDispatch).whenComplete(() {
       log.info('Processed ${queuedMessages.length} messages in ${(new DateTime.now().difference(start)).inMilliseconds} milliseconds. Sleeping for ${msgdisp.config.mailerPeriod} seconds');
-      reSchedule();
+      //reSchedule();
     });
   }).catchError((error, stackTrace) {
     /// TODO (KRC, TL): We need to figure out what to do here. As it stands we
@@ -112,31 +107,35 @@ Timer reSchedule() =>
  *
  */
 bool showHelp() => parsedArgs['help'];
-
-/**
- *
- */
-List<Model.MessageRecipient> smsRecipients(Model.Message message) =>
-    message.recipients.where((Model.MessageRecipient recipient) =>
-        recipient.endpoints.contains(Model.MessageEndpointType.SMS)).toList();
+//
+///**
+// *
+// */
+//List<Model.DistributionListEntry> smsRecipients(Model.Message message) =>
+//    message.recipients.where((Model.DistributionListEntry recipient) =>
+//        recipient.endpoints.contains(Model.MessageEndpointType.SMS)).toList();
 
 /**
  *
  */
 Future tryDispatch(Model.MessageQueueItem queueItem) {
-  return queueItem.message(Router.messageStore).then((Model.Message message) {
-
-    if (!message.recipients.hasRecipients) {
-      log.severe ("No recipients detected on message with ID ${message.ID}!");
-      queueItem.tries++;
-      queueItem.save(Router.messageQueueStore);
-
-    } else {
+  return new Future(() {
+    log.severe('MessageDispatcher is currently disable due to heavy refactoring');
+  });
 
-      return new Future(() {
-        log.fine('Dispatching messageID ${message.ID} - queueID: ${queueItem.ID}');
-        Model.Template email = new Model.TemplateEmail(message, emailEndpoints(queueItem.unhandledEndpoints));
-        log.fine(email.toString());
+//  return queueItem.message(Router.messageStore).then((Model.Message message) {
+//
+//    if (!message.recipients.hasRecipients) {
+//      log.severe ("No recipients detected on message with ID ${message.ID}!");
+//      queueItem.tries++;
+//      queueItem.create(Router.messageQueueStore);
+//
+//    } else {
+//
+//      return new Future(() {
+//        log.fine('Dispatching messageID ${message.ID} - queueID: ${queueItem.ID}');
+//        Model.Template email = new Model.TemplateEmail(message, emailEndpoints(queueItem.unhandledRecipients));
+//        log.fine(email.toString());
 
 //        process.exitCode.then((int exitCode) {
 //          if (exitCode != 0) {
@@ -162,8 +161,8 @@ Future tryDispatch(Model.MessageQueueItem queueItem) {
 //            queueItem.save(Router.messageQueueStore);
 //          }
 //        });
-
-      });
-    }
-  });
+//
+//      });
+//    }
+// });
 }

db_src/schema.sql

@@ -127,7 +127,8 @@ INSERT INTO recipient_visibilities VALUES ('to'), ('cc'), ('bcc');
 CREATE TABLE messages (
    id                        INTEGER   NOT NULL PRIMARY KEY, --  AUTOINCREMENT
    message                   TEXT      NOT NULL,
-   context_contact_id        INTEGER       NULL REFERENCES contacts   (id),
+   recipients                JSON      NOT NULL DEFAULT '[]',
+   context_contact_id        INTEGER  NOT NULL REFERENCES contacts   (id),
    context_reception_id      INTEGER   NOT NULL REFERENCES receptions (id),
    context_contact_name      TEXT          NULL DEFAULT NULL, --  Dereferenced contact name.
    context_reception_name    TEXT      NOT NULL,              --  Dereferenced reception name.
@@ -141,17 +142,6 @@ CREATE TABLE messages (
    created_at                TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
 
-CREATE TABLE message_recipients (
-   contact_id     INTEGER NOT NULL,
-   reception_id   INTEGER NOT NULL,
-   message_id     INTEGER NOT NULL,
-   recipient_role TEXT    NOT NULL,
-   contact_name   TEXT    NOT NULL, --  Dereferenced contact name.
-   reception_name TEXT    NOT NULL, --  Dereferenced reception name.
-
-   PRIMARY KEY (contact_id, reception_id, message_id)
-);
-
 --  The message_queue is a simple job-stack that, when a item is present in the
 --  table, indicates that is has not been delived to a transport agent.
 --  'unhandled_endpoints' stores a list of recipient endpoints, still waiting
@@ -450,7 +440,6 @@ ALTER TABLE messaging_address_types OWNER TO openreception;
 ALTER TABLE messaging_end_points OWNER TO openreception;
 ALTER TABLE recipient_visibilities OWNER TO openreception;
 ALTER TABLE messages OWNER TO openreception;
-ALTER TABLE message_recipients OWNER TO openreception;
 ALTER TABLE message_queue OWNER TO openreception;
 ALTER TABLE message_queue_history OWNER TO openreception;
 ALTER TABLE calendar_events OWNER TO openreception;

db_src/test_data_dk.sql

@@ -1177,10 +1177,6 @@ VALUES ('kim.rostgaard@gmail.com', 2),
 INSERT INTO  messages (id, message, context_contact_id, context_reception_id, context_contact_name, context_reception_name, taken_from_name, taken_from_company, taken_from_phone, taken_from_cellphone, taken_by_agent, flags, created_at)
 VALUES (1, 'Det drejer sig om kosten i gangen - du ved hvad der skal gøres.',4, 1, 'Kim Rostgaard', 'BitStackers', 'Jens Olsen', 'Blik A/S', '22114411', '33551122', 2, '["urgent"]', NOW());
 
-INSERT INTO message_recipients (contact_id, reception_id, message_id, recipient_role, contact_name, reception_name)
-VALUES (4, 1, 1, 'to', 'Kim Rostgaard Chrisensen', 'BitStackers'),
-       (4, 2, 1, 'cc', 'Kim Rostgaard Chrisensen', 'Gir');
-
 INSERT INTO message_queue (id, message_id, enqueued_at, last_try, tries)
 VALUES (1000000, 1, NOW(), NULL, 0);
 

db_src/test_data_en.sql

@@ -1177,10 +1177,6 @@ VALUES ('kim.rostgaard@gmail.com', 2),
 INSERT INTO  messages (id, message, context_contact_id, context_reception_id, context_contact_name, context_reception_name, taken_from_name, taken_from_company, taken_from_phone, taken_from_cellphone, taken_by_agent, flags, created_at)
 VALUES (1, 'About Car rental; are there convertibles in stock?',4, 1, 'Kim Rostgaard', 'BitStackers', 'John Johnson', 'AnyCorp', '22114411', '33551122', 2, '["urgent"]', NOW());
 
-INSERT INTO message_recipients (contact_id, reception_id, message_id, recipient_role, contact_name, reception_name)
-VALUES (4, 1, 1, 'to', 'Kim Rostgaard Chrisensen', 'BitStackers'),
-       (4, 2, 1, 'cc', 'Kim Rostgaard Chrisensen', 'Gir');
-
 INSERT INTO message_queue (id, message_id, enqueued_at, last_try, tries)
 VALUES (1000000, 1, NOW(), NULL, 0);
 

lib/contact_server/database.dart

@@ -10,7 +10,6 @@ import 'package:openreception_framework/storage.dart'  as Storage;
 import 'package:openreception_framework/util.dart'     as Util;
 import 'configuration.dart';
 
-part 'db/contact.dart';
 part 'db/contact-calendar.dart';
 
 const String libraryName = 'contactserver.database';