5
5
import com .objectcomputing .checkins .notifications .email .MailJetFactory ;
6
6
import com .objectcomputing .checkins .services .MailJetFactoryReplacement ;
7
7
import com .objectcomputing .checkins .services .TestContainersSuite ;
8
+ import com .objectcomputing .checkins .services .feedback_external_recipient .FeedbackExternalRecipient ;
8
9
import com .objectcomputing .checkins .services .feedback_template .FeedbackTemplate ;
9
10
import com .objectcomputing .checkins .services .fixture .FeedbackRequestFixture ;
10
11
import com .objectcomputing .checkins .services .fixture .FeedbackTemplateFixture ;
11
12
import com .objectcomputing .checkins .services .fixture .MemberProfileFixture ;
13
+ import com .objectcomputing .checkins .services .fixture .FeedbackExternalRecipientFixture ;
12
14
import com .objectcomputing .checkins .services .fixture .ReviewPeriodFixture ;
13
15
import com .objectcomputing .checkins .services .fixture .RoleFixture ;
14
16
import com .objectcomputing .checkins .services .memberprofile .MemberProfile ;
45
47
import static org .junit .jupiter .api .Assertions .assertTrue ;
46
48
47
49
@ Property (name = "replace.mailjet.factory" , value = StringUtils .TRUE )
48
- class FeedbackRequestControllerTest extends TestContainersSuite implements MemberProfileFixture , FeedbackTemplateFixture , FeedbackRequestFixture , RoleFixture , ReviewPeriodFixture {
50
+ class FeedbackRequestControllerTest extends TestContainersSuite implements MemberProfileFixture , FeedbackTemplateFixture , FeedbackRequestFixture , RoleFixture , ReviewPeriodFixture , FeedbackExternalRecipientFixture {
49
51
50
52
@ Inject
51
53
@ Client ("/services/feedback/requests" )
@@ -80,6 +82,7 @@ private FeedbackRequestCreateDTO createDTO(FeedbackRequest feedbackRequest) {
80
82
dto .setDueDate (feedbackRequest .getDueDate ());
81
83
dto .setStatus (feedbackRequest .getStatus ());
82
84
dto .setSubmitDate (feedbackRequest .getSubmitDate ());
85
+ dto .setExternalRecipientId (feedbackRequest .getExternalRecipientId ());
83
86
return dto ;
84
87
}
85
88
@@ -120,15 +123,15 @@ private void assertResponseEqualsEntity(FeedbackRequest feedbackRequest, Feedbac
120
123
}
121
124
122
125
@ Test
123
- void testCreateFeedbackRequestByAdmin () {
126
+ void testCreateFeedbackRequestByAdminToRecipient () {
124
127
//create two member profiles: one for normal employee, one for admin
125
128
final MemberProfile memberProfile = createADefaultMemberProfile ();
126
129
final MemberProfile admin = getMemberProfileRepository ().save (mkMemberProfile ("admin" ));
127
130
final MemberProfile recipient = createADefaultRecipient ();
128
131
assignAdminRole (admin );
129
132
130
133
//create feedback request
131
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , memberProfile , recipient );
134
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , memberProfile , recipient );
132
135
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
133
136
134
137
//send feedback request
@@ -147,11 +150,11 @@ void testCreateFeedbackRequestByAdminToExternalRecipient() {
147
150
//create two member profiles: one for normal employee, one for admin
148
151
final MemberProfile memberProfile = createADefaultMemberProfile ();
149
152
final MemberProfile admin = getMemberProfileRepository ().save (mkMemberProfile ("admin" ));
150
- final MemberProfile recipient = createADefaultRecipient ();
153
+ final FeedbackExternalRecipient feedbackExternalRecipient = createADefaultFeedbackExternalRecipient ();
151
154
assignAdminRole (admin );
152
155
153
156
//create feedback request
154
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , memberProfile , recipient );
157
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithExternalRecipient (admin , memberProfile , feedbackExternalRecipient );
155
158
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
156
159
157
160
//send feedback request
@@ -174,7 +177,7 @@ void testCreateFeedbackRequestByAssignedPDL() {
174
177
final MemberProfile recipient = createADefaultRecipient ();
175
178
176
179
//create feedback request
177
- final FeedbackRequest feedbackRequest = createFeedbackRequest (pdlMemberProfile , employeeMemberProfile , recipient );
180
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (pdlMemberProfile , employeeMemberProfile , recipient );
178
181
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
179
182
180
183
//send feedback request
@@ -198,7 +201,7 @@ void testCreateFeedbackRequestSendsEmailNow() {
198
201
final MemberProfile recipient = createADefaultRecipient ();
199
202
200
203
//create feedback request
201
- final FeedbackRequest feedbackRequest = createFeedbackRequest (pdlMemberProfile , employeeMemberProfile , recipient );
204
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (pdlMemberProfile , employeeMemberProfile , recipient );
202
205
feedbackRequest .setSendDate (LocalDate .now ());
203
206
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
204
207
@@ -230,7 +233,7 @@ void testCreateFeedbackRequestSendsEmailFuture() {
230
233
final MemberProfile recipient = createADefaultRecipient ();
231
234
232
235
//create feedback request
233
- final FeedbackRequest feedbackRequest = createFeedbackRequest (pdlMemberProfile , employeeMemberProfile , recipient );
236
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (pdlMemberProfile , employeeMemberProfile , recipient );
234
237
feedbackRequest .setSendDate (LocalDate .now ().plusDays (1 ));
235
238
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
236
239
@@ -253,7 +256,7 @@ void testCreateFeedbackRequestByUnassignedPdl() {
253
256
MemberProfile recipient = createAnUnrelatedUser ();
254
257
255
258
//create feedback request
256
- final FeedbackRequest feedbackRequest = createFeedbackRequest (memberProfileForPDL , memberProfile , recipient );
259
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (memberProfileForPDL , memberProfile , recipient );
257
260
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
258
261
259
262
//send feedback request
@@ -273,7 +276,7 @@ void testCreateFeedbackRequestByMember() {
273
276
MemberProfile recipient = createAnUnrelatedUser ();
274
277
275
278
//create feedback request
276
- final FeedbackRequest feedbackRequest = createFeedbackRequest (requesteeProfile , memberProfile , recipient );
279
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (requesteeProfile , memberProfile , recipient );
277
280
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
278
281
279
282
//send feedback request
@@ -293,7 +296,7 @@ void testCreateFeedbackRequestWithInvalidCreatorId() {
293
296
assignAdminRole (admin );
294
297
295
298
// Create feedback request with invalid creator ID
296
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
299
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
297
300
feedbackRequest .setCreatorId (UUID .randomUUID ());
298
301
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
299
302
@@ -315,7 +318,7 @@ void testCreateFeedbackRequestWithInvalidRecipientId() {
315
318
assignAdminRole (admin );
316
319
317
320
// Create feedback request with invalid recipient ID
318
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
321
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
319
322
feedbackRequest .setRecipientId (UUID .randomUUID ());
320
323
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
321
324
@@ -337,7 +340,7 @@ void testCreateFeedbackRequestWithInvalidRequesteeId() {
337
340
assignAdminRole (admin );
338
341
339
342
// Create feedback request with invalid requestee ID
340
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
343
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
341
344
feedbackRequest .setRequesteeId (UUID .randomUUID ());
342
345
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
343
346
@@ -359,7 +362,7 @@ void testCreateFeedbackRequestWithNoRequestee() {
359
362
assignAdminRole (admin );
360
363
361
364
// Create feedback request with no requestee
362
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
365
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
363
366
feedbackRequest .setRequesteeId (null );
364
367
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
365
368
@@ -383,7 +386,7 @@ void testCreateFeedbackRequestWithNoRecipients() {
383
386
assignAdminRole (admin );
384
387
385
388
// Create feedback request with no recipient(s)
386
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
389
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
387
390
feedbackRequest .setRecipientId (null );
388
391
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
389
392
@@ -407,7 +410,7 @@ void testCreateFeedbackRequestWithNoSelectedTemplate() {
407
410
assignAdminRole (admin );
408
411
409
412
// Create feedback request with no template
410
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
413
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
411
414
feedbackRequest .setTemplateId (null );
412
415
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
413
416
@@ -431,7 +434,7 @@ void testCreateFeedbackRequestWithSendDateAfterDueDate() {
431
434
assignAdminRole (admin );
432
435
433
436
// Create feedback request with invalid requestee ID
434
- final FeedbackRequest feedbackRequest = createFeedbackRequest (admin , requestee , recipient );
437
+ final FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (admin , requestee , recipient );
435
438
feedbackRequest .setSendDate (LocalDate .of (1111 , 11 , 2 ));
436
439
feedbackRequest .setDueDate (LocalDate .of (1111 , 11 , 1 ));
437
440
final FeedbackRequestCreateDTO dto = createDTO (feedbackRequest );
@@ -1006,7 +1009,7 @@ void testUpdateSubmitDateNotAuthorized() {
1006
1009
MemberProfile recipient = createADefaultRecipient ();
1007
1010
1008
1011
// Save feedback request that has not been submitted yet
1009
- final FeedbackRequest feedbackReq = createFeedbackRequest (pdl , requestee , recipient );
1012
+ final FeedbackRequest feedbackReq = createFeedbackRequestWithRecipient (pdl , requestee , recipient );
1010
1013
feedbackReq .setSubmitDate (null );
1011
1014
getFeedbackRequestRepository ().save (feedbackReq );
1012
1015
@@ -1030,7 +1033,7 @@ void testUpdateSubmitDateWhenPdlEnablesEdits() {
1030
1033
MemberProfile recipient = createADefaultRecipient ();
1031
1034
1032
1035
// Save feedback request that has already been submitted
1033
- final FeedbackRequest feedbackReq = createFeedbackRequest (pdl , requestee , recipient );
1036
+ final FeedbackRequest feedbackReq = createFeedbackRequestWithRecipient (pdl , requestee , recipient );
1034
1037
feedbackReq .setSubmitDate (LocalDate .now ());
1035
1038
getFeedbackRequestRepository ().save (feedbackReq );
1036
1039
@@ -1055,7 +1058,7 @@ void testFeedbackRequestEnableEditsSendsEmail() {
1055
1058
MemberProfile recipient = createADefaultRecipient ();
1056
1059
1057
1060
// Save feedback request that has already been submitted
1058
- final FeedbackRequest feedbackReq = createFeedbackRequest (pdl , requestee , recipient );
1061
+ final FeedbackRequest feedbackReq = createFeedbackRequestWithRecipient (pdl , requestee , recipient );
1059
1062
feedbackReq .setSubmitDate (LocalDate .now ());
1060
1063
feedbackReq .setStatus ("submitted" );
1061
1064
getFeedbackRequestRepository ().save (feedbackReq );
@@ -1272,7 +1275,7 @@ void testRecipientGetBeforeSendDateNotAuthorized() {
1272
1275
MemberProfile pdlMemberProfile = createADefaultMemberProfile ();
1273
1276
MemberProfile requestee = createADefaultMemberProfileForPdl (pdlMemberProfile );
1274
1277
MemberProfile recipient = createADefaultRecipient ();
1275
- FeedbackRequest feedbackRequest = createFeedbackRequest (pdlMemberProfile , requestee , recipient );
1278
+ FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (pdlMemberProfile , requestee , recipient );
1276
1279
feedbackRequest .setSendDate (LocalDate .now ().plusDays (1 ));
1277
1280
getFeedbackRequestRepository ().save (feedbackRequest );
1278
1281
@@ -1296,7 +1299,7 @@ void testRecipientGetBeforeSendDateAsAdminAuthorized() {
1296
1299
assignAdminRole (adminUser );
1297
1300
1298
1301
// Save feedback request with send date in the future
1299
- FeedbackRequest feedbackRequest = createFeedbackRequest (pdlMemberProfile , requestee , recipient );
1302
+ FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (pdlMemberProfile , requestee , recipient );
1300
1303
feedbackRequest .setSendDate (LocalDate .now ().plusDays (1 ));
1301
1304
getFeedbackRequestRepository ().save (feedbackRequest );
1302
1305
@@ -1318,7 +1321,7 @@ void testRecipientGetBeforeSendDateAsPdlAuthorized() {
1318
1321
MemberProfile recipient = createADefaultRecipient ();
1319
1322
1320
1323
// Save feedback request with send date in the future
1321
- FeedbackRequest feedbackRequest = createFeedbackRequest (pdlMemberProfile , requestee , recipient );
1324
+ FeedbackRequest feedbackRequest = createFeedbackRequestWithRecipient (pdlMemberProfile , requestee , recipient );
1322
1325
feedbackRequest .setSendDate (LocalDate .now ().plusDays (1 ));
1323
1326
getFeedbackRequestRepository ().save (feedbackRequest );
1324
1327
0 commit comments