@tiledesk/tiledesk-server 2.2.13 → 2.2.17

Sign up to get free protection for your applications and to get access to all the features.
@@ -162,8 +162,9 @@ describe('DepartmentService()', function () {
162
162
 
163
163
  // winston.info("createdLead", createdLead.toObject());
164
164
  // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight, channel, location) {
165
-
166
- requestService.createWithIdAndRequester("request_id1", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest) {
165
+ var now = Date.now();
166
+
167
+ requestService.createWithIdAndRequester("request_id1-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest) {
167
168
 
168
169
  // requestService.createWithId("request_id1", "requester_id1", savedProject._id, "first_text", createdDepartment._id).then(function(savedRequest) {
169
170
 
@@ -172,7 +173,7 @@ describe('DepartmentService()', function () {
172
173
  winston.debug("resolve operatorsResult0", operatorsResult0); //time invariant?
173
174
 
174
175
  // requestService.createWithId("request_id2", "requester_id1", savedProject._id, "first_text", createdDepartment._id).then(function(savedRequest2) {
175
- requestService.createWithIdAndRequester("request_id2", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest2) {
176
+ requestService.createWithIdAndRequester("request_id2-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest2) {
176
177
 
177
178
  departmentService.getOperators(createdDepartment._id, savedProject._id, false).then(function(operatorsResult) {
178
179
  winston.info("resolve operatorsResult", operatorsResult);
@@ -288,8 +289,8 @@ describe('DepartmentService()', function () {
288
289
 
289
290
  // winston.info("createdLead", createdLead.toObject());
290
291
  // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight, channel, location) {
291
-
292
- requestService.createWithIdAndRequester("request_id1", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest) {
292
+ var now = Date.now();
293
+ requestService.createWithIdAndRequester("request_id1-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest) {
293
294
 
294
295
 
295
296
  // getOperators(departmentid, projectid, nobot) {
@@ -297,7 +298,7 @@ describe('DepartmentService()', function () {
297
298
  winston.debug("resolve operatorsResult0", operatorsResult0); //time invariant?
298
299
 
299
300
  // requestService.createWithId("request_id2", "requester_id1", savedProject._id, "first_text", createdDepartment._id).then(function(savedRequest2) {
300
- requestService.createWithIdAndRequester("request_id2", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest2) {
301
+ requestService.createWithIdAndRequester("request_id2-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest2) {
301
302
 
302
303
  departmentService.getOperators(createdDepartment._id, savedProject._id, false).then(function(operatorsResult) {
303
304
  winston.info("resolve operatorsResult", operatorsResult);
@@ -371,9 +372,9 @@ describe('DepartmentService()', function () {
371
372
 
372
373
 
373
374
  departmentService.create("PooledDepartment-for-createWithIdWith-createRoundRobinWithAssignedLastOperatorNotAvailableAndOtherNotAvailableDepartment", savedProject._id, routingConstants.ASSIGNED, savedUser._id).then(function(createdDepartment) {
374
-
375
+ var now = Date.now();
375
376
  leadService.createIfNotExists("request_id1-getallWithLoLead", "email@getallWithLoLead.com", savedProject._id).then(function(createdLead) {
376
- requestService.createWithIdAndRequester("request_id1", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest) {
377
+ requestService.createWithIdAndRequester("request_id1-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest) {
377
378
 
378
379
  // requestService.createWithId("request_id1", "requester_id1", savedProject._id, "first_text", createdDepartment._id).then(function(savedRequest) {
379
380
 
@@ -387,7 +388,7 @@ describe('DepartmentService()', function () {
387
388
 
388
389
 
389
390
  // requestService.createWithId("request_id2", "requester_id1", savedProject._id, "first_text", createdDepartment._id).then(function(savedRequest2) {
390
- requestService.createWithIdAndRequester("request_id2", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest2) {
391
+ requestService.createWithIdAndRequester("request_id2-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text",createdDepartment._id).then(function(savedRequest2) {
391
392
 
392
393
  departmentService.getOperators(createdDepartment._id, savedProject._id, false).then(function(operatorsResult) {
393
394
  winston.info("resolve operatorsResult", operatorsResult);
package/test/faqRoute.js CHANGED
@@ -38,7 +38,7 @@ describe('FaqKBRoute', () => {
38
38
  chai.request(server)
39
39
  .post('/'+ savedProject._id + '/faq_kb')
40
40
  .auth(email, pwd)
41
- .send({"name":"testbot", type: "external"})
41
+ .send({"name":"testbot", type: "internal"})
42
42
  .end((err, res) => {
43
43
  //console.log("res", res);
44
44
  console.log("res.body", res.body);
@@ -77,6 +77,60 @@ describe('FaqKBRoute', () => {
77
77
 
78
78
 
79
79
 
80
+ it('createWithLanguage', (done) => {
81
+
82
+
83
+ // this.timeout();
84
+
85
+ var email = "test-signup-" + Date.now() + "@email.com";
86
+ var pwd = "pwd";
87
+
88
+ userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
89
+ projectService.create("test-faqkb-create", savedUser._id).then(function(savedProject) {
90
+ chai.request(server)
91
+ .post('/'+ savedProject._id + '/faq_kb')
92
+ .auth(email, pwd)
93
+ .send({"name":"testbot", type: "internal", language: "it"})
94
+ .end((err, res) => {
95
+ //console.log("res", res);
96
+ console.log("res.body", res.body);
97
+ res.should.have.status(200);
98
+ res.body.should.be.a('object');
99
+ expect(res.body.name).to.equal("testbot");
100
+ expect(res.body.language).to.equal("it");
101
+ var id_faq_kb = res.body._id;
102
+
103
+ chai.request(server)
104
+ .post('/'+ savedProject._id + '/faq')
105
+ .auth(email, pwd)
106
+ .send({id_faq_kb: id_faq_kb, question: "question1", answer: "answer1"})
107
+ .end((err, res) => {
108
+ //console.log("res", res);
109
+ console.log("res.body", res.body);
110
+ res.should.have.status(200);
111
+ res.body.should.be.a('object');
112
+ expect(res.body.id_faq_kb).to.equal(id_faq_kb);
113
+ expect(res.body.question).to.equal("question1");
114
+ expect(res.body.answer).to.equal("answer1");
115
+ expect(res.body.intent_display_name).to.not.equal(undefined);
116
+ expect(res.body.webhook_enabled).to.equal(false);
117
+ expect(res.body.language).to.equal("it");
118
+ done();
119
+ });
120
+
121
+ });
122
+
123
+
124
+ });
125
+ });
126
+
127
+ });
128
+
129
+
130
+
131
+
132
+
133
+
80
134
  it('createWithIntentDisplayNameAndWebhookEnalbed', (done) => {
81
135
 
82
136
 
@@ -91,7 +145,7 @@ describe('FaqKBRoute', () => {
91
145
  chai.request(server)
92
146
  .post('/'+ savedProject._id + '/faq_kb')
93
147
  .auth(email, pwd)
94
- .send({"name":"testbot", type: "external"})
148
+ .send({"name":"testbot", type: "internal"})
95
149
  .end((err, res) => {
96
150
  //console.log("res", res);
97
151
  console.log("res.body", res.body);
@@ -143,7 +197,7 @@ describe('FaqKBRoute', () => {
143
197
  chai.request(server)
144
198
  .post('/'+ savedProject._id + '/faq_kb')
145
199
  .auth(email, pwd)
146
- .send({"name":"testbot", type: "external"})
200
+ .send({"name":"testbot", type: "internal"})
147
201
  .end((err, res) => {
148
202
  //console.log("res", res);
149
203
  console.log("res.body", res.body);
@@ -210,7 +264,7 @@ describe('FaqKBRoute', () => {
210
264
  chai.request(server)
211
265
  .post('/'+ savedProject._id + '/faq_kb')
212
266
  .auth(email, pwd)
213
- .send({"name":"testbot", type: "external"})
267
+ .send({"name":"testbot", type: "internal"})
214
268
  .end((err, res) => {
215
269
  //console.log("res", res);
216
270
  console.log("res.body", res.body);
@@ -243,6 +297,60 @@ describe('FaqKBRoute', () => {
243
297
 
244
298
  });
245
299
 
300
+
301
+
302
+
303
+
304
+
305
+
306
+ it('uploadcsvWithLanguage', (done) => {
307
+
308
+
309
+ // this.timeout();
310
+
311
+ var email = "test-signup-" + Date.now() + "@email.com";
312
+ var pwd = "pwd";
313
+
314
+ userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
315
+ projectService.create("test-uploadcsv", savedUser._id).then(function(savedProject) {
316
+
317
+ chai.request(server)
318
+ .post('/'+ savedProject._id + '/faq_kb')
319
+ .auth(email, pwd)
320
+ .send({"name":"testbot", type: "internal", language: "it"})
321
+ .end((err, res) => {
322
+ //console.log("res", res);
323
+ console.log("res.body", res.body);
324
+ res.should.have.status(200);
325
+ res.body.should.be.a('object');
326
+ expect(res.body.name).to.equal("testbot");
327
+ expect(res.body.language).to.equal("it");
328
+ var id_faq_kb = res.body._id;
329
+
330
+ chai.request(server)
331
+ .post('/'+ savedProject._id + '/faq/uploadcsv')
332
+ .auth(email, pwd)
333
+ .set('Content-Type', 'text/csv')
334
+ .attach('uploadFile', fs.readFileSync('./test/example-faqs.csv'), 'example-faqs.csv')
335
+ .field('id_faq_kb', id_faq_kb)
336
+ .field('delimiter', ';')
337
+ // .send({id_faq_kb: id_faq_kb})
338
+ .end((err, res) => {
339
+ console.log("err", err);
340
+ console.log("res.body", res.body);
341
+ res.should.have.status(200);
342
+ res.body.should.be.a('object');
343
+
344
+ done();
345
+ });
346
+
347
+ });
348
+
349
+ });
350
+ });
351
+
352
+ });
353
+
246
354
 
247
355
 
248
356
 
@@ -1,9 +1,10 @@
1
1
  //During the test the env variable is set to test
2
2
  process.env.NODE_ENV = 'test';
3
3
 
4
- var User = require('../models/user');
4
+ var Faq = require('../models/faq');
5
5
  var projectService = require('../services/projectService');
6
6
  var userService = require('../services/userService');
7
+ var faqService = require('../services/faqService');
7
8
 
8
9
  //Require the dev-dependencies
9
10
  let chai = require('chai');
@@ -61,6 +62,61 @@ describe('FaqKBRoute', () => {
61
62
 
62
63
 
63
64
 
65
+ // mocha test/faqkbRoute.js --grep 'train'
66
+ it('train', (done) => {
67
+
68
+
69
+ // this.timeout();
70
+
71
+ var email = "test-signup-" + Date.now() + "@email.com";
72
+ var pwd = "pwd";
73
+
74
+ userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
75
+ projectService.create("test-faqkb-train", savedUser._id).then(function(savedProject) {
76
+ faqService.create("testbot", "http://54.228.177.1644", savedProject._id, savedUser._id).then(function(savedBot) {
77
+
78
+ var newFaq = new Faq({
79
+ id_faq_kb: savedBot._id,
80
+ question: "question1\nquestion2",
81
+ answer: "answer",
82
+ id_project: savedProject._id,
83
+ topic: "default",
84
+ createdBy: savedUser._id,
85
+ updatedBy: savedUser._id
86
+ });
87
+
88
+ newFaq.save(function (err, savedFaq) {
89
+ console.log("err", err);
90
+ console.log("savedFaq", savedFaq);
91
+ expect(savedBot.name).to.equal("testbot");
92
+ expect(savedBot.secret).to.not.equal(null);
93
+
94
+ chai.request(server)
95
+ .post('/'+ savedProject._id + '/faq_kb/train')
96
+ .auth(email, pwd)
97
+ .send({"id_faq_kb":savedBot._id})
98
+ .end((err, res) => {
99
+ //console.log("res", res);
100
+ console.log("res.body", res.body);
101
+ res.should.have.status(200);
102
+ res.body.should.be.a('object');
103
+ expect(res.body.train.nlu.intent).to.equal(savedBot.intent_display_name);
104
+ // expect(res.body.text).to.equal("addestramento avviato");
105
+
106
+
107
+ done();
108
+ });
109
+
110
+
111
+ });
112
+ });
113
+ });
114
+ });
115
+ }).timeout(20000);
116
+
117
+
118
+
119
+
64
120
 
65
121
  });
66
122
 
@@ -277,9 +277,9 @@ it('createWithSenderFromLead', function (done) {
277
277
  leadService.createIfNotExistsWithLeadId(uid,"leadfullname", "email@email.com", savedProject._id).then(function(createdLead) {
278
278
  // console.log("createdLead",createdLead);
279
279
 
280
-
280
+ var now = Date.now();
281
281
  chai.request(server)
282
- .post('/'+ savedProject._id + '/requests/req123-createwithsender/messages')
282
+ .post('/'+ savedProject._id + '/requests/req123-createwithsender-'+now+'/messages')
283
283
  .auth(email, pwd)
284
284
  .set('content-type', 'application/json')
285
285
  .send({"text":"text", "sender": uid})
@@ -292,13 +292,13 @@ it('createWithSenderFromLead', function (done) {
292
292
  expect(res.body.sender).to.equal(uid);
293
293
  // expect(res.body.sender).to.equal(savedProjectAndPU.project_user._id.toString());
294
294
  expect(res.body.senderFullname).to.equal("leadfullname");
295
- expect(res.body.recipient).to.equal("req123-createwithsender");
295
+ expect(res.body.recipient).to.equal("req123-createwithsender-"+now);
296
296
  expect(res.body.text).to.equal("text");
297
297
  expect(res.body.id_project).to.equal(savedProject._id.toString());
298
298
  expect(res.body.createdBy).to.equal(savedUser._id.toString());
299
299
  expect(res.body.status).to.equal(0);
300
300
 
301
- expect(res.body.request.request_id).to.equal("req123-createwithsender");
301
+ expect(res.body.request.request_id).to.equal("req123-createwithsender-"+now);
302
302
  expect(res.body.request.requester._id).to.equal(savedProject_user._id.toString());
303
303
  expect(res.body.request.requester.uuid_user).to.equal(uid);
304
304
  // expect(res.body.request.requester.id_user.firstname).to.equal("Test Firstname22");
@@ -151,12 +151,12 @@ it('createUpperCaseEmail', function (done) {
151
151
  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
152
152
  projectService.createAndReturnProjectAndProjectUser("createWithId", savedUser._id).then(function(savedProjectAndPU) {
153
153
  var savedProject = savedProjectAndPU.project;
154
-
154
+ var now = Date.now();
155
155
 
156
156
  // leadService.createIfNotExists("leadfullname", "email@email.com", savedProject._id).then(function(createdLead) {
157
157
  // createWithId(request_id, requester_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status) {
158
158
  // requestService.createWithId("request_id1", createdLead._id, savedProject._id, "first_text").then(function(savedRequest) {
159
- requestService.createWithIdAndRequester("request_requestroute-getbyid", savedProjectAndPU.project_user._id,null, savedProject._id, "first_text").then(function(savedRequest) {
159
+ requestService.createWithIdAndRequester("request_requestroute-getbyid-"+now, savedProjectAndPU.project_user._id,null, savedProject._id, "first_text").then(function(savedRequest) {
160
160
  winston.debug("resolve", savedRequest.toObject());
161
161
 
162
162
 
@@ -173,7 +173,7 @@ it('createUpperCaseEmail', function (done) {
173
173
 
174
174
  res.body.should.have.property('department').not.eql(null);
175
175
  // res.body.should.have.property('lead').eql(null);
176
- res.body.should.have.property('request_id').eql("request_requestroute-getbyid");
176
+ res.body.should.have.property('request_id').eql("request_requestroute-getbyid-"+now);
177
177
  res.body.should.have.property('requester').not.eql(null);
178
178
 
179
179
  expect(res.body.participantsAgents.length).to.equal(1);
@@ -224,12 +224,13 @@ it('getbyidWithPartecipatingBots', function (done) {
224
224
 
225
225
  winston.error("err", err);
226
226
  winston.info("updatedDepartment", updatedDepartment.toObject());
227
+ var now = Date.now();
227
228
 
228
229
 
229
230
  // leadService.createIfNotExists("leadfullname", "email@email.com", savedProject._id).then(function(createdLead) {
230
231
  // createWithId(request_id, requester_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status) {
231
232
  // requestService.createWithId("request_id1", createdLead._id, savedProject._id, "first_text").then(function(savedRequest) {
232
- requestService.createWithIdAndRequester("request_requestroute-getbyidWithPartecipatingBots", savedProjectAndPU.project_user._id,null, savedProject._id, "first_text").then(function(savedRequest) {
233
+ requestService.createWithIdAndRequester("request_requestroute-getbyidWithPartecipatingBots-"+now, savedProjectAndPU.project_user._id,null, savedProject._id, "first_text").then(function(savedRequest) {
233
234
  winston.debug("resolve", savedRequest.toObject());
234
235
 
235
236
 
@@ -247,7 +248,7 @@ it('getbyidWithPartecipatingBots', function (done) {
247
248
  res.body.should.have.property('department').not.eql(null);
248
249
 
249
250
  // res.body.should.have.property('lead').eql(null);
250
- res.body.should.have.property('request_id').eql("request_requestroute-getbyidWithPartecipatingBots");
251
+ res.body.should.have.property('request_id').eql("request_requestroute-getbyidWithPartecipatingBots-"+now);
251
252
  res.body.should.have.property('requester').not.eql(null);
252
253
  expect(res.body.requester._id).to.not.equal(savedProjectAndPU.project_user._id);
253
254
 
@@ -299,9 +300,10 @@ it('getbyidWithPartecipatingBots', function (done) {
299
300
 
300
301
  console.log("createdLead", createdLead);
301
302
 
303
+ var now = Date.now();
302
304
 
303
305
  var new_request = {
304
- request_id: "request_id1", project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
306
+ request_id: "request_id-getallSimple-"+now, project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
305
307
  id_project:savedProject._id, first_text: "first_text",
306
308
  lead:createdLead, requester: savedProjectAndPU.project_user
307
309
  };
@@ -378,9 +380,10 @@ it('getallNoPopulate', function (done) {
378
380
  leadService.createIfNotExists("leadfullname", "email@email.com", savedProject._id).then(function(createdLead) {
379
381
  // createWithId(request_id, requester_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status) {
380
382
  // requestService.createWithId("request_id1", createdLead._id, savedProject._id, "first_text").then(function(savedRequest) {
383
+ var now = Date.now();
381
384
 
382
385
  var request = {
383
- request_id:"request_id1", project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
386
+ request_id:"request_getallNoPopulate-"+now, project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
384
387
  id_project:savedProject._id, first_text: "first_text",
385
388
  lead:createdLead, requester: savedProjectAndPU.project_user };
386
389
 
@@ -460,10 +463,11 @@ it('getallFilter-snap_department_routing', function (done) {
460
463
  leadService.createIfNotExists("leadfullname", "email-getallfilter@email.com", savedProject._id).then(function(createdLead) {
461
464
 
462
465
  console.log("createdLead", createdLead);
466
+ var now = Date.now();
463
467
 
464
468
 
465
469
  var new_request = {
466
- request_id: "request_id1", project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
470
+ request_id: "request_id-getallFilter-snap_department_routing-"+now, project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
467
471
  id_project:savedProject._id, first_text: "first_text",
468
472
  lead:createdLead, requester: savedProjectAndPU.project_user
469
473
  };
@@ -546,9 +550,10 @@ it('getallFilter-snap_department_default', function (done) {
546
550
 
547
551
  console.log("createdLead", createdLead);
548
552
 
553
+ var now = Date.now();
549
554
 
550
555
  var new_request = {
551
- request_id: "request_id1", project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
556
+ request_id: "request_id-getallFilter-snap_department_routing-"+now, project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
552
557
  id_project:savedProject._id, first_text: "first_text",
553
558
  lead:createdLead, requester: savedProjectAndPU.project_user
554
559
  };
@@ -631,9 +636,10 @@ it('getallFilter-snap_department_id_bot_exists', function (done) {
631
636
 
632
637
  console.log("createdLead", createdLead);
633
638
 
639
+ var now = Date.now();
634
640
 
635
641
  var new_request = {
636
- request_id: "request_id1", project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
642
+ request_id: "request_id-getallFilter-snap_department_id_bot_exists-"+now, project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
637
643
  id_project:savedProject._id, first_text: "first_text",
638
644
  lead:createdLead, requester: savedProjectAndPU.project_user
639
645
  };
@@ -708,8 +714,9 @@ it('getallcsv', function (done) {
708
714
 
709
715
  winston.info("createdLead", createdLead.toObject());
710
716
  // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight, channel, location) {
717
+ var now = Date.now();
711
718
 
712
- requestService.create({request_id: "request_id1", project_user_id: savedProjectAndPU.project_user._id, lead_id: createdLead._id, id_project: savedProject._id,
719
+ requestService.create({request_id: "request_id-getallcsv-"+now, project_user_id: savedProjectAndPU.project_user._id, lead_id: createdLead._id, id_project: savedProject._id,
713
720
  first_text: "first_text", tags: [{tag: "tag1"},{tag: "tag2"}]}).then(function(savedRequest) {
714
721
  winston.info("resolve", savedRequest.toObject());
715
722
 
@@ -757,8 +764,9 @@ it('getallWithLoLead', function (done) {
757
764
 
758
765
  winston.info("createdLead", createdLead.toObject());
759
766
  // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight, channel, location) {
760
-
761
- requestService.createWithIdAndRequester("request_id1", savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text").then(function(savedRequest) {
767
+ var now = Date.now();
768
+
769
+ requestService.createWithIdAndRequester("request_id-getallWithLoLead-"+now, savedProjectAndPU.project_user._id,createdLead._id, savedProject._id, "first_text").then(function(savedRequest) {
762
770
 
763
771
  winston.debug("resolve", savedRequest.toObject());
764
772
 
@@ -1044,19 +1052,21 @@ it('removeParticipant', function (done) {
1044
1052
  leadService.createIfNotExists("leadfullname", "email@email.com", savedProject._id).then(function(createdLead) {
1045
1053
  winston.info("savedProjectAndPU.project_user._id:" +savedProjectAndPU.project_user._id);
1046
1054
 
1055
+ var now = Date.now();
1056
+
1047
1057
  // projectService.create("request-removeParticipant", savedUser._id).then(function(savedProject) {
1048
1058
  // requestService.removeParticipantByRequestId(savedRequest.request_id, savedProject._id, userid).then(function(savedRequestParticipant) {
1049
1059
  var request = {
1050
- request_id:"request_id1-removeParticipant", project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
1060
+ request_id:"request_id1-removeParticipant-"+now, project_user_id:savedProjectAndPU.project_user._id, lead_id:createdLead._id,
1051
1061
  id_project:savedProject._id, first_text: "first_text",
1052
1062
  lead:createdLead, requester: savedProjectAndPU.project_user };
1053
1063
 
1054
1064
  requestService.create(request).then(function(savedRequest) {
1055
1065
  winston.info("savedRequest", savedRequest.toObject());
1056
- expect(savedRequest.request_id).to.equal("request_id1-removeParticipant");
1066
+ expect(savedRequest.request_id).to.equal("request_id1-removeParticipant-"+now);
1057
1067
 
1058
1068
  chai.request(server)
1059
- .delete('/'+ savedProject._id + '/requests/'+'request_id1-removeParticipant'+"/participants/"+savedUser._id)
1069
+ .delete('/'+ savedProject._id + '/requests/'+'request_id1-removeParticipant-'+now+"/participants/"+savedUser._id)
1060
1070
  .auth(email, pwd)
1061
1071
  .set('content-type', 'application/json')
1062
1072
  .send({"text":"first_text"})