Skip to content

Commit e97be27

Browse files
Luch76Luch76
committed
Merge branch 'develop' into feature-2645/feedback-request-add-ability-to-request-feedback-from-external-source
# Conflicts: # server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java # web-ui/src/pages/FeedbackRequestPage.jsx
2 parents 3d45329 + e7808ac commit e97be27

36 files changed

+540
-229
lines changed

‎server/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
micronautVersion=4.6.3
1+
micronautVersion=4.7.0
22
seleniumVersion=4.24.0

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
66
import com.objectcomputing.checkins.services.reviews.ReviewPeriod;
77
import jnr.constants.platform.Local;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
810
import java.time.LocalDate;
911
import java.time.LocalDateTime;
1012
import java.time.temporal.ChronoUnit;
@@ -17,6 +19,8 @@
1719

1820
public interface FeedbackRequestFixture extends RepositoryFixture, FeedbackTemplateFixture {
1921

22+
static final Logger LOG = LoggerFactory.getLogger(FeedbackRequestFixture.class);
23+
2024
/**
2125
* Creates a sample feedback request
2226
* @param creator The {@link MemberProfile} of the creator of the feedback request
@@ -98,6 +102,8 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
98102
}
99103

100104
default LocalDate getRandomLocalDateTime(LocalDateTime start, LocalDateTime end) {
105+
if(start.isEqual(end)) return end.toLocalDate();
106+
101107
LocalDate startDate = start.toLocalDate();
102108
long daysBetween = ChronoUnit.DAYS.between(startDate, end.toLocalDate());
103109
Random random = new Random();
@@ -120,10 +126,22 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
120126

121127
default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberProfile requestee, MemberProfile recipient, UUID templateId, ReviewPeriod reviewPeriod, String status) {
122128
LocalDate submitDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), reviewPeriod.getCloseDate());
129+
LOG.info("Period start date: {} Generated Submit Date: {}", reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
130+
if(submitDate.atStartOfDay().isAfter(LocalDateTime.now())) submitDate = LocalDateTime.now().toLocalDate();
123131
LocalDate sendDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
124132
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), recipient.getId(), templateId, sendDate, null, status, submitDate, reviewPeriod.getId(), null));
125133
}
126134

135+
default FeedbackRequest saveSampleFeedbackRequestWithStatus(MemberProfile creator, MemberProfile requestee, MemberProfile recipient, UUID templateId, String status) {
136+
LocalDate testDate = LocalDate.of(2010, 10, 8);
137+
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), recipient.getId(), templateId, testDate, null, status, null, null, null));
138+
}
139+
140+
default FeedbackRequest saveSampleFeedbackRequestWithStatus(MemberProfile creator, MemberProfile requestee, FeedbackExternalRecipient externalRecipient, UUID templateId, String status) {
141+
LocalDate testDate = LocalDate.of(2010, 10, 8);
142+
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), null, templateId, testDate, null, status, null, null, externalRecipient.getId()));
143+
}
144+
127145
/**
128146
* Saves a sample feedback request
129147
* @param creator The {@link MemberProfile} of the creator of the feedback request
@@ -137,16 +155,6 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
137155
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), null, templateId, testDate, null, "pending", null, reviewPeriod.getId(), externalRecipient.getId()));
138156
}
139157

140-
default FeedbackRequest saveSampleFeedbackRequestWithStatus(MemberProfile creator, MemberProfile requestee, MemberProfile recipient, UUID templateId, String status) {
141-
LocalDate testDate = LocalDate.of(2010, 10, 8);
142-
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), recipient.getId(), templateId, testDate, null, status, null, null, null));
143-
}
144-
145-
default FeedbackRequest saveSampleFeedbackRequestWithStatus(MemberProfile creator, MemberProfile requestee, FeedbackExternalRecipient externalRecipient, UUID templateId, String status) {
146-
LocalDate testDate = LocalDate.of(2010, 10, 8);
147-
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), null, templateId, testDate, null, status, null, null, externalRecipient.getId()));
148-
}
149-
150158
default MemberProfile createADefaultRecipient() {
151159
return getMemberProfileRepository().save(new MemberProfile("Ron", null, "Swanson",
152160
null, "Parks Director", null, "Pawnee, Indiana",

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

Lines changed: 24 additions & 30 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

4847
LocalDateTime selfReviewCloseDate = launchDate.plusDays(4);
49-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
50-
LocalDateTime startDate = launchDate.minusDays(30);
51-
LocalDateTime endDate = closeDate.minusDays(1);
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(

‎server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodControllerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ void testSelfReviewThreeDaysEmail() {
833833
// launch date, the self-review closes 4 days after the launch date.
834834
// So, to get the three day email, we just need to add 1 day to the
835835
// launch date.
836-
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1);
836+
LocalDateTime launchDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
837837
checkSelfReviewEmail(launchDate, launchDate.plusDays(1),
838838
" closes in three days!");
839839
}
@@ -844,7 +844,7 @@ void testSelfReviewOneDayEmail() {
844844
// launch date, the self-review closes 4 days after the launch date.
845845
// So, to get the one day email, we just need to add 3 days to the
846846
// launch date.
847-
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1);
847+
LocalDateTime launchDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
848848
checkSelfReviewEmail(launchDate, launchDate.plusDays(3),
849849
" closes in one day!");
850850
}

‎web-ui/src/components/action_item/ActionItemsPanel.test.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const server = setupServer(
7171
)
7272
);
7373

74-
beforeAll(() => server.listen());
74+
beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
7575
afterEach(() => server.resetHandlers());
7676
afterAll(() => server.close());
7777

‎web-ui/src/components/agenda/Agenda.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const AgendaItems = () => {
4343
const currentUserId = memberProfile?.id;
4444
const currentCheckin = selectCheckin(state, checkinId);
4545

46-
const [agendaItems, setAgendaItems] = useState();
46+
const [agendaItems, setAgendaItems] = useState([]);
4747
const [description, setDescription] = useState('');
4848
const [isLoading, setIsLoading] = useState(false);
4949

‎web-ui/src/components/celebrations/MyAnniversary.test.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import MyAnniversary from './MyAnniversary';
33
import { AppContextProvider } from '../../context/AppContext';
44
import { BrowserRouter } from 'react-router-dom';
55

6-
const hideMyAnniversary = false;
6+
const hideMyAnniversary = () => {};
77
const myAnniversary = {
88
name: 'Suman Maroju',
99
anniversary: '12/29/2012',

‎web-ui/src/components/checkin/documents/CheckinDocs.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const UploadDocs = () => {
5656
});
5757
}
5858
} catch (e) {
59-
console.log(e);
59+
console.error("getCheckinFiles: " + e);
6060
}
6161
}
6262
if (csrf) {
@@ -98,7 +98,7 @@ const UploadDocs = () => {
9898
setFiles([...files, data]);
9999
} catch (e) {
100100
setFileColors(fileColors => ({ ...fileColors, [file.name]: 'red' }));
101-
console.log({ e });
101+
console.error("addFiles: " + e);
102102
} finally {
103103
setLoading(false);
104104
}

‎web-ui/src/components/contribution_hours/ProgressBar.test.jsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ import ProgressBar from './ProgressBar';
33
import renderer from 'react-test-renderer';
44

55
it('has billable hours', () => {
6-
snapshot(<ProgressBar props={(1200, 1500, 1850, 0, 0, 0)} />);
6+
snapshot(<ProgressBar billableHours={1200}
7+
contributionHours={1500}
8+
targetHours={1850} />);
79
});
810

911
it('has no billable hours', () => {
10-
snapshot(<ProgressBar props={(0, 1500, 1850, 0, 0, 0)} />);
12+
snapshot(<ProgressBar billableHours={0}
13+
contributionHours={1500}
14+
targetHours={1850} />);
1115
});

‎web-ui/src/components/contribution_hours/__snapshots__/ProgressBar.test.jsx.snap‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@ exports[`has billable hours 1`] = `
1414
<span
1515
aria-valuemax="100"
1616
aria-valuemin="0"
17-
aria-valuenow="50"
18-
class="MuiLinearProgress-root MuiLinearProgress-colorPrimary MuiLinearProgress-determinate css-eglki6-MuiLinearProgress-root"
17+
aria-valuenow="65"
18+
class="MuiLinearProgress-root MuiLinearProgress-colorPrimary MuiLinearProgress-buffer css-fl5ss-MuiLinearProgress-root"
1919
role="progressbar"
2020
>
2121
<span
22-
class="MuiLinearProgress-bar MuiLinearProgress-barColorPrimary MuiLinearProgress-bar1Determinate css-5xe99f-MuiLinearProgress-bar1"
23-
style="transform: translateX(-50%);"
22+
class="MuiLinearProgress-dashed MuiLinearProgress-dashedColorPrimary css-8ub8io-MuiLinearProgress-dashed"
23+
/>
24+
<span
25+
class="MuiLinearProgress-bar MuiLinearProgress-barColorPrimary MuiLinearProgress-bar1Buffer css-qhoknl-MuiLinearProgress-bar1"
26+
style="transform: translateX(-35.13513513513513%);"
27+
/>
28+
<span
29+
class="MuiLinearProgress-bar MuiLinearProgress-colorPrimary MuiLinearProgress-bar2Buffer css-1qdnzt4-MuiLinearProgress-bar2"
30+
style="transform: translateX(-18.91891891891892%);"
2431
/>
2532
</span>
2633
</div>
@@ -30,9 +37,10 @@ exports[`has billable hours 1`] = `
3037
style="display: block;"
3138
>
3239
Billable Hours:
40+
1200
3341
- Contribution Hours:
3442
35-
925
43+
1500
3644
- Target Hours:
3745
1850
3846
- PTO Hours:
@@ -66,13 +74,13 @@ exports[`has no billable hours 1`] = `
6674
<span
6775
aria-valuemax="100"
6876
aria-valuemin="0"
69-
aria-valuenow="50"
77+
aria-valuenow="81"
7078
class="MuiLinearProgress-root MuiLinearProgress-colorPrimary MuiLinearProgress-determinate css-eglki6-MuiLinearProgress-root"
7179
role="progressbar"
7280
>
7381
<span
7482
class="MuiLinearProgress-bar MuiLinearProgress-barColorPrimary MuiLinearProgress-bar1Determinate css-5xe99f-MuiLinearProgress-bar1"
75-
style="transform: translateX(-50%);"
83+
style="transform: translateX(-18.91891891891892%);"
7684
/>
7785
</span>
7886
</div>
@@ -82,9 +90,10 @@ exports[`has no billable hours 1`] = `
8290
style="display: block;"
8391
>
8492
Billable Hours:
93+
0
8594
- Contribution Hours:
8695
87-
925
96+
1500
8897
- Target Hours:
8998
1850
9099
- PTO Hours:

0 commit comments

Comments
 (0)