Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ public interface FeedbackRequestRepository extends CrudRepository<FeedbackReques
, nativeQuery = true)
List<FeedbackRequest> findByValues(@Nullable String creatorId, @Nullable String requesteeId, @Nullable String recipientId, @Nullable LocalDate oldestDate, @Nullable String reviewPeriodId, @Nullable String templateId);

List<FeedbackRequest> findBySendDateBeforeAndStatusEqual(LocalDate sendDate, String status);
List<FeedbackRequest> findBySendDateNotAfterAndStatusEqual(LocalDate sendDate, String status);
}

Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
import com.objectcomputing.checkins.services.feedback_request.FeedbackRequestRepository;
import com.objectcomputing.checkins.services.feedback_request.FeedbackRequestServicesImpl;
import jakarta.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.LocalDate;
import java.util.List;

@Singleton
public class CheckServicesImpl implements CheckServices {

private static final Logger LOG = LoggerFactory.getLogger(CheckServicesImpl.class);
private final FeedbackRequestServicesImpl feedbackRequestServices;
private final FeedbackRequestRepository feedbackRequestRepository;

Expand All @@ -22,7 +26,8 @@ public CheckServicesImpl(FeedbackRequestServicesImpl feedbackRequestServices,
@Override
public boolean sendScheduledEmails() {
LocalDate today = LocalDate.now();
List<FeedbackRequest> feedbackRequests = feedbackRequestRepository.findBySendDateBeforeAndStatusEqual(today, "pending");
List<FeedbackRequest> feedbackRequests = feedbackRequestRepository.findBySendDateNotAfterAndStatusEqual(today, "pending");
LOG.info("About to send emails: " + feedbackRequests.size());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

for (FeedbackRequest req: feedbackRequests) {
feedbackRequestServices.sendNewRequestEmail(req);
req.setStatus("sent");
Expand Down
4 changes: 4 additions & 0 deletions server/src/main/resources/db/dev/R__Load_testing_data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,10 @@ INSERT INTO feedback_requests
VALUES
('ab2da7fc-fac2-11eb-9a03-0242ac130003', '59b790d2-fabc-11eb-9a03-0242ac130003', '2dee821c-de32-4d9c-9ecb-f73e5903d17a', '67dc3a3b-5bfa-4759-997a-fb6bac98dcf3' ,'18ef2032-c264-411e-a8e1-ddda9a714bae', '2021-08-01', '2021-08-05', null, 'pending');

INSERT INTO feedback_requests
(id, creator_id, requestee_id, recipient_id, template_id, send_date, due_date, submit_date, status) -- requestee: Zach Brown, recipient: Michael Kimberlin
VALUES
('ab2da7fc-fac2-11eb-9a03-0242ac130004', '59b790d2-fabc-11eb-9a03-0242ac130003', '43ee8e79-b33d-44cd-b23c-e183894ebfef', '6207b3fd-042d-49aa-9e28-dcc04f537c2d' ,'18ef2032-c264-411e-a8e1-ddda9a714bae', (NOW())::date, (NOW() + INTERVAL '1 DAY')::date, null, 'pending');
---- Creator: Zack Brown
INSERT INTO feedback_requests
(id, creator_id, requestee_id, recipient_id, template_id, send_date, due_date, submit_date, status) -- requestee: Faux Freddy, recipient: Zack Brown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void sendScheduledEmails() {
FeedbackRequest retrievedRequest = new FeedbackRequest();
retrievedRequest.setStatus("pending");
List<FeedbackRequest> list = Collections.singletonList(retrievedRequest);
when(feedbackRequestRepository.findBySendDateBeforeAndStatusEqual(any(),eq("pending"))).thenReturn(list);
when(feedbackRequestRepository.findBySendDateNotAfterAndStatusEqual(any(),eq("pending"))).thenReturn(list);
checkServices.sendScheduledEmails();
verify(feedbackRequestServices).sendNewRequestEmail(retrievedRequest);
retrievedRequest.setStatus("sent");
Expand Down