diff --git a/db/migrations/20180530165342_spelling_corrections.js b/db/migrations/20180530165342_spelling_corrections.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c50082fb7dd487a97b46b12a36dafa150545c13
--- /dev/null
+++ b/db/migrations/20180530165342_spelling_corrections.js
@@ -0,0 +1,14 @@
+
+exports.up = async function(knex, Promise) {
+ await knex.schema.renameTable('question', 'questions');
+ await knex.schema.renameTable('answer', 'answers');
+ await knex.schema.renameTable('private_post', 'private_posts');
+ return;
+};
+
+exports.down = async function(knex, Promise) {
+ await knex.schema.renameTable('questions', 'question');
+ await knex.schema.renameTable('answers', 'answer');
+ await knex.schema.renameTable('private_posts', 'private_post');
+ return;
+};
diff --git a/db/seeds/02_make_posts.js b/db/seeds/02_make_posts.js
index 1a7eeb0186be2dd02710cac516f47e2ef78d641b..1979d205e658ed0247822418667041cf07567044 100644
--- a/db/seeds/02_make_posts.js
+++ b/db/seeds/02_make_posts.js
@@ -1,26 +1,78 @@
-exports.seed = function(knex, Promise) {
+exports.seed = async function(knex, Promise) {
// Deletes ALL existing entries
- return knex('announcements').del()
- .then(function () {
- const posts = [{
- title: "Fissurer c'est bien",
- content: "Les nouveaux ordis du JTX sont arrivés ! Le BR aide à les installer ;)",
- authors: ['br','jtx']
- },{
- title: "Proj'et Promotion",
- content: "La nouvelle proj' du JTX arrive !",
- authors: ['br']
- },{
- title: "Fête de la Lune",
- content: "C'est bientôt la fête de la Lune ! Inscrivez-vous pour un dîner-spectacle dans le Grand Hall !",
- authors: ['x-chine']
- },{
- title: "Formation Web",
- content: "Envie d'apprendre à faire un site Web en Django ? Alors viens en amphi Sauvy ce jeudi à 20h !",
- authors: ['br']
- }];
+ await knex('announcements').del();
+ await knex('announcements').insert([{
+ id: 0,
+ title: "Fissurer c'est bien",
+ content: "Les nouveaux ordis du JTX sont arrivés ! Le BR aide à les installer ;)"
+ },{
+ id: 1,
+ title: "Proj'et Promotion",
+ content: "La nouvelle proj' du JTX arrive !"
+ },{
+ id: 2,
+ title: "Fête de la Lune",
+ content: "C'est bientôt la fête de la Lune ! Inscrivez-vous pour un dîner-spectacle dans le Grand Hall !"
+ },{
+ id: 3,
+ title: "Formation Web",
+ content: "Envie d'apprendre à faire un site Web en Django ? Alors viens en amphi Sauvy ce jeudi à 20h !"
+ }]);
- return knex('announcements').insert(posts);
- });
+ await knex('events').del()
+ await knex('events').insert([
+ {
+ id : 42,
+ title : "coder sigma",
+ content : "Tous ensemble pour faire du Dev. Que demander de plus ? (a part du sommeil)",
+ start_time : knex.fn.now(),
+ end_time : knex.fn.now(),
+ is_announcement : false
+ }
+ ]);
+
+ await knex('group_message_relationships').del();
+
+ await knex('group_message_relationships').insert([
+ {
+ message : 42,
+ group : 'br',
+ status : 'host'
+ },
+ {
+ message : 42,
+ group : 'kes',
+ status : 'recieve'
+ }
+
+ ]);
+
+ await knex('group_message_relationships').insert([{
+ message: 0,
+ group: 'br',
+ status: 'host'
+ },
+ {
+ message: 0,
+ group: 'jtx',
+ status: 'host'
+ },
+ {
+ message: 1,
+ group: 'br',
+ status: 'host'
+ },
+ {
+ message: 2,
+ group: 'xchine',
+ status: 'host'
+ },
+ {
+ message: 3,
+ group: 'br',
+ status: 'host'
+ }]);
+
+ return;
};
diff --git a/db/seeds/07_make_event.js b/db/seeds/07_make_event.js
deleted file mode 100644
index 31c17a350942411c09d6ec8d6e6aa80a6a06262b..0000000000000000000000000000000000000000
--- a/db/seeds/07_make_event.js
+++ /dev/null
@@ -1,33 +0,0 @@
-
-exports.seed = async function(knex, Promise) {
- // Deletes ALL existing entries
- await knex('events').del()
- await knex('group_message_relationships').del()
- // Inserts seed entries
- await knex('events').insert([
- {
- id : 42,
- title : "coder sigma",
- content : "Tous ensemble pour faire du Dev. Que demander de plus ? (a part du sommeil)",
- start_time : knex.fn.now(),
- end_time : knex.fn.now(),
- authors : [],
- is_announcement : false
- }
- ]);
-
- return knex('group_message_relationships').insert([
- {
- message : 42,
- group : 'br',
- status : 'host'
- },
- {
- message : 42,
- group : 'kes',
- status : 'recieve'
- }
-
- ]);
-
-};
diff --git a/src/graphql/connectors/authentifiers.js b/src/graphql/connectors/authentifiers.js
index 4c6c0ad1da6040f2ae8befb6505d7c80c3e28faf..0d52399afc2ba069c4fda3d687167802105454b9 100644
--- a/src/graphql/connectors/authentifiers.js
+++ b/src/graphql/connectors/authentifiers.js
@@ -62,7 +62,7 @@ export async function member(user, groupUID){
let group_list = await selectors.groupsWithMember(user);
let test = group_list && await knex.with('group_list', group_list).select().from('group_list').where('uid', groupUID);
if(test && test[0])
- return new User(user, null);
+ return new User(user, new UtilisateurAnonyme());
return await admin(user, groupUID);
}
@@ -87,7 +87,7 @@ export async function speaker(user, groupUID){
export async function admin(user, groupUID){
let adminList = await list_selectors.usersWithAdminRights(user, groupUID);
if (typeof adminList != "undefined" && adminList.indexOf(user.uid) != -1)
- return new User(user, null);
+ return new User(user, new UtilisateurAnonyme());
}
/**
diff --git a/src/graphql/resolvers.js b/src/graphql/resolvers.js
index a1e51be7aee2823420239fb6d8c2d4a4352656de..7f847f9bb4151feafb8692067327ee64b3ed1248 100644
--- a/src/graphql/resolvers.js
+++ b/src/graphql/resolvers.js
@@ -17,7 +17,13 @@ import * as authentifiers from './connectors/authentifiers';
* @description Résolveurs des différentes requêtes GraphQL
*/
-// ceci est un test
+function ChevalierError(err){
+ this.returned_error = err;
+ this.name = "chevalier error";
+ this.message = "Error encountered while running ldap access code : " + err.message;
+ this.toString = () => this.message;
+}
+
export const resolvers = {
// @rights user
@@ -318,7 +324,7 @@ export const resolvers = {
admins: async function(obj, args, context){
let user = await authentifiers.member(context.user, obj.uid);
- return user.ldap_access.listMembers(context.user,obj.uid);
+ return await user.ldap_access.listMembers(context.user,obj.uid);
},
members: async function(obj, args, context){