Skip to content

Commit 19b3e60

Browse files
mkimberlinmkimberlin
committed
Adjusted date generation logic
1 parent e26f3e4 commit 19b3e60

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
55
import com.objectcomputing.checkins.services.reviews.ReviewPeriod;
66
import jnr.constants.platform.Local;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
79

810
import java.time.LocalDate;
911

@@ -18,6 +20,8 @@
1820

1921
public interface FeedbackRequestFixture extends RepositoryFixture, FeedbackTemplateFixture {
2022

23+
static final Logger LOG = LoggerFactory.getLogger(FeedbackRequestFixture.class);
24+
2125
/**
2226
* Creates a sample feedback request
2327
* @param creator The {@link MemberProfile} of the creator of the feedback request
@@ -81,6 +85,8 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
8185

8286
default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberProfile requestee, MemberProfile recipient, UUID templateId, ReviewPeriod reviewPeriod, String status) {
8387
LocalDate submitDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), reviewPeriod.getCloseDate());
88+
LOG.info("Period start date: {} Generated Submit Date: {}", reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
89+
if(submitDate.atStartOfDay().isAfter(LocalDateTime.now())) submitDate = LocalDateTime.now().toLocalDate();
8490
LocalDate sendDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
8591
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), recipient.getId(), templateId, sendDate, null, status, submitDate, reviewPeriod.getId()));
8692
}

‎server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java‎

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
import com.objectcomputing.checkins.services.reviews.ReviewPeriod;
44
import com.objectcomputing.checkins.services.reviews.ReviewStatus;
55

6+
import java.time.temporal.TemporalUnit;
67
import java.util.UUID;
78
import java.time.LocalDateTime;
89
import java.time.temporal.ChronoUnit;
910

1011
public interface ReviewPeriodFixture extends RepositoryFixture {
1112

1213
default ReviewPeriod createADefaultReviewPeriod() {
13-
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
14-
.truncatedTo(ChronoUnit.MILLIS);
15-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
16-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
17-
LocalDateTime startDate = launchDate.minusDays(30);
18-
LocalDateTime endDate = closeDate.minusDays(1);
14+
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
15+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
16+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
17+
LocalDateTime startDate = launchDate.minusDays(31);
18+
LocalDateTime endDate = launchDate.minusDays(1);
1919
return getReviewPeriodRepository().save(
2020
new ReviewPeriod("Period of Time", ReviewStatus.OPEN, null, null,
2121
launchDate, selfReviewCloseDate, closeDate,
@@ -27,12 +27,11 @@ default ReviewPeriod createADefaultReviewPeriod(ReviewStatus reviewStatus) {
2727
}
2828

2929
default ReviewPeriod createADefaultReviewPeriod(ReviewStatus reviewStatus, UUID templateId) {
30-
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
31-
.truncatedTo(ChronoUnit.MILLIS);
32-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
33-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
34-
LocalDateTime startDate = launchDate.minusDays(30);
35-
LocalDateTime endDate = closeDate.minusDays(1);
30+
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
31+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
32+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
33+
LocalDateTime startDate = launchDate.minusDays(31);
34+
LocalDateTime endDate = launchDate.minusDays(1);
3635
return getReviewPeriodRepository().save(
3736
new ReviewPeriod("Period of Time", reviewStatus, templateId, null,
3837
launchDate, selfReviewCloseDate, closeDate,
@@ -43,12 +42,12 @@ default ReviewPeriod createADefaultReviewPeriod(
4342
LocalDateTime launchDate,
4443
ReviewStatus reviewStatus,
4544
UUID templateId, UUID selfReviewTemplateId) {
46-
launchDate = launchDate.truncatedTo(ChronoUnit.MILLIS);
45+
launchDate = launchDate.truncatedTo(ChronoUnit.DAYS);
4746

48-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(4);
49-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
50-
LocalDateTime startDate = launchDate.minusDays(30);
51-
LocalDateTime endDate = closeDate.minusDays(1);
47+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
48+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
49+
LocalDateTime startDate = launchDate.minusDays(31);
50+
LocalDateTime endDate = launchDate.minusDays(1);
5251
return getReviewPeriodRepository().save(
5352
new ReviewPeriod("Specific Launch Date", reviewStatus, templateId,
5453
selfReviewTemplateId,
@@ -57,32 +56,27 @@ default ReviewPeriod createADefaultReviewPeriod(
5756
}
5857

5958
default ReviewPeriod createASecondaryReviewPeriod() {
60-
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
61-
.truncatedTo(ChronoUnit.MILLIS);
62-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
63-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
64-
LocalDateTime startDate = launchDate.minusDays(30);
65-
LocalDateTime endDate = closeDate.minusDays(1);
59+
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
60+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
61+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
62+
LocalDateTime startDate = launchDate.minusDays(31);
63+
LocalDateTime endDate = launchDate.minusDays(1);
6664
return getReviewPeriodRepository().save(
6765
new ReviewPeriod("Period of Play", ReviewStatus.OPEN, null, null,
6866
launchDate, selfReviewCloseDate, closeDate,
6967
startDate, endDate));
7068
}
7169

7270
default ReviewPeriod createAClosedReviewPeriod() {
73-
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
74-
.truncatedTo(ChronoUnit.MILLIS);
75-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
76-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
77-
LocalDateTime startDate = launchDate.minusDays(30);
78-
LocalDateTime endDate = closeDate.minusDays(1);
71+
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
72+
LocalDateTime startDate = launchDate.minusDays(31);
73+
LocalDateTime endDate = launchDate.minusDays(1);
7974
return createAClosedReviewPeriod(startDate, endDate);
8075
}
8176

8277
default ReviewPeriod createAClosedReviewPeriod(
8378
LocalDateTime periodStart, LocalDateTime periodEnd) {
84-
LocalDateTime launchDate = periodEnd.plusMinutes(1)
85-
.truncatedTo(ChronoUnit.MILLIS).plusDays(1);
79+
LocalDateTime launchDate = periodEnd.plusDays(1).truncatedTo(ChronoUnit.DAYS);
8680
LocalDateTime selfReviewCloseDate = launchDate.plusDays(3);
8781
LocalDateTime closeDate = selfReviewCloseDate.plusDays(7);
8882
return getReviewPeriodRepository().save(

0 commit comments

Comments
 (0)