From 1f03ff14c35d73936db4f9226e392303de424694 Mon Sep 17 00:00:00 2001
From: anatole <anatole.romon@polytechnique.edu>
Date: Sun, 15 Apr 2018 16:33:09 +0200
Subject: [PATCH] new message tables

---
 db/migrations/20180415160405_message_types.js | 39 ++++++++++++
 src/graphql/typeDefs/actions.js               |  3 -
 src/graphql/typeDefs/objects.js               | 60 +++++++++++++++----
 3 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 db/migrations/20180415160405_message_types.js

diff --git a/db/migrations/20180415160405_message_types.js b/db/migrations/20180415160405_message_types.js
new file mode 100644
index 0000000..6311e4e
--- /dev/null
+++ b/db/migrations/20180415160405_message_types.js
@@ -0,0 +1,39 @@
+
+exports.up = async function(knex, Promise) {
+  await knex.schema.dropTable('posts');
+  await knex.schema.table('messages', function(table){    
+    table.dropColumn('authors');
+  });
+  await knex.schema.createTable('private_post', function(table){
+    table.inherits('messages');
+    table.string('author_uid', 128).notNullable();
+    table.enum('author_db', ['ldap']).notNullable().defaultTo('ldap');
+    table.string('recipient_uid', 128).notNullable();
+  });
+  await knex.schema.createTable('question', function(table){
+    table.inherits('messages');
+    table.string('author_uid', 128).notNullable();
+    table.enum('author_db', ['ldap']).notNullable().defaultTo('ldap');
+    table.string('recipient_uid', 128).notNullable();
+  });
+  await knex.schema.createTable('answer', function(table){
+    table.inherits('messages');
+    table.string('author_uid', 128).notNullable();
+    table.string('recipient_uid', 128).notNullable();
+    table.string('for_question', 128).notNullable();
+  });
+  return;
+};
+
+exports.down = async function(knex, Promise) {
+    await knex.schema.dropTable('answer');
+    await knex.schema.dropTable('question');
+    await knex.schema.dropTable('private_post');
+    await knex.schema.table('messages', function(table){
+        table.specificType('authors', knex.raw('varchar(128)[]'));
+    });
+    await knex.schema.createTable('posts', function(table) {
+        table.inherits('messages');
+    });
+    return;
+};
diff --git a/src/graphql/typeDefs/actions.js b/src/graphql/typeDefs/actions.js
index e5858ae..b60fa65 100644
--- a/src/graphql/typeDefs/actions.js
+++ b/src/graphql/typeDefs/actions.js
@@ -15,8 +15,6 @@ const RootTypes = `
 
         allMessages: [Message]
         message(id: ID!): Message
-        allPosts: [Post]
-        post(id: ID!): Post
         allEvents: [Event]
         allAnnouncements: [Announcement]
         
@@ -198,7 +196,6 @@ const subQueries = `
     type MessageQuery{
         allMessages: [Message]
         allEvents: [Event]
-        allPosts: [Post]
         message(id: ID): Message
         allAnnouncements: [Announcement]
     }
diff --git a/src/graphql/typeDefs/objects.js b/src/graphql/typeDefs/objects.js
index 7c4b487..08093c6 100644
--- a/src/graphql/typeDefs/objects.js
+++ b/src/graphql/typeDefs/objects.js
@@ -120,18 +120,6 @@ const Message = `
         recipient: Recipient
     }
 
-    # Publication postée par un ou plusieurs groupes.
-    type Post implements Message {
-        id: ID!
-        title: String!
-        createdAt: String!
-        updatedAt: String!
-        content: String!
-
-        authors: Author
-        recipient: Recipient
-    }
-
     # Annonce publique effectuée par un ou plusieurs groupes.
     type Announcement implements Message {
         id: ID!
@@ -168,6 +156,54 @@ const Message = `
         authors: Author
         recipient: Recipient
     }
+
+    # Post interne d'un membre sur la page interne de son groupe
+    type PrivatePost implements Message {
+        id: ID!
+        createdAt: String!
+        updatedAt: String!
+        title: String!
+        content: String!
+
+        authors: User
+        recipient: Group
+    }
+
+    # Question posée par un user à un groupe
+    type Question implements Message {
+        id: ID!
+        createdAt: String!
+        updatedAt: String!
+        title: String!
+        content: String!
+
+        authors: User
+        recipient: Group
+
+        # Une annonce éventuellement concernée par cette question. 
+        # Null si la question ne concerne pas une annonce particulière
+
+        forAnnouncement : Announcement
+
+        # Référence la réponse donnée par le groupe à cette Question. Si pas encore répondu, null.
+        forAnswer: Answer
+    }
+
+    # Réponse à une Question 
+    type Answer implements Message {
+        id: ID!
+        createdAt: String!
+        updatedAt: String!
+        title: String!
+        content: String!
+
+        authors: Group
+        recipient: Group
+
+        # La question à laquelle cette Answer répond. Non-nullable bien sûr
+        forQuestion: Question!
+    }
+
 `;
 
 const Requests = `
-- 
GitLab