Skip to content

Commit 710226f

Browse files
mkimberlinmkimberlin
authored
Merge pull request #2789 from objectcomputing/release/0.8
Release v0.8.11 to production
2 parents 4e22f39 + d7017bf commit 710226f

File tree

65 files changed

+3782
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3782
-271
lines changed

‎.github/workflows/gradle-deploy-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
PROJECT_ID: ${{ secrets.RUN_PROJECT }}
88
RUN_REGION: us-central1
99
SERVICE_NAME: checkins-develop
10-
TARGET_URL: https://checkins-develop-tuvcfzotpq-uc.a.run.app
10+
TARGET_URL: https://checkins-develop-832140020593.us-central1.run.app
1111
jobs:
1212
test:
1313
runs-on: ubuntu-latest

‎server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id "jacoco"
88
}
99

10-
version "0.8.10"
10+
version "0.8.11"
1111
group "com.objectcomputing.checkins"
1212

1313
repositories {

‎server/src/main/resources/META-INF/native-image/com.objectcomputing/checkins/reflect-config.json

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,200 @@
5151
]
5252
}
5353
]
54+
},
55+
{
56+
"name": "org.flywaydb.core.api.migration.baseline.BaselineMigrationConfigurationExtension",
57+
"condition": {
58+
"typeReachable": "org.flywaydb.core.api.configuration.ClassicConfiguration"
59+
},
60+
"allDeclaredFields": true
61+
},
62+
{
63+
"name": "org.flywaydb.core.api.migration.baseline.BaselineMigrationConfigurationExtension",
64+
"queryAllDeclaredMethods": true,
65+
"condition": {
66+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
67+
},
68+
"allDeclaredFields": true,
69+
"queryAllDeclaredConstructors": true,
70+
"methods": [
71+
{
72+
"name": "<init>",
73+
"parameterTypes": [
74+
]
75+
},
76+
{
77+
"name": "getBaselineMigrationPrefix",
78+
"parameterTypes": [
79+
]
80+
},
81+
{
82+
"name": "setBaselineMigrationPrefix",
83+
"parameterTypes": [
84+
"java.lang.String"
85+
]
86+
}
87+
]
88+
},
89+
{
90+
"name": "org.flywaydb.core.extensibility.ConfigurationExtension",
91+
"queryAllDeclaredMethods": true,
92+
"condition": {
93+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
94+
}
95+
},
96+
{
97+
"name": "org.flywaydb.core.extensibility.Plugin",
98+
"queryAllDeclaredMethods": true,
99+
"condition": {
100+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
101+
}
102+
},
103+
{
104+
"name": "org.flywaydb.core.internal.command.clean.CleanModeConfigurationExtension",
105+
"queryAllDeclaredMethods": true,
106+
"condition": {
107+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
108+
},
109+
"allDeclaredFields": true,
110+
"queryAllDeclaredConstructors": true,
111+
"methods": [
112+
{
113+
"name": "<init>",
114+
"parameterTypes": [
115+
]
116+
},
117+
{
118+
"name": "getClean",
119+
"parameterTypes": [
120+
]
121+
},
122+
{
123+
"name": "setClean",
124+
"parameterTypes": [
125+
"org.flywaydb.core.internal.command.clean.CleanModel"
126+
]
127+
}
128+
]
129+
},
130+
{
131+
"name": "org.flywaydb.core.internal.command.clean.CleanModel",
132+
"queryAllDeclaredMethods": true,
133+
"condition": {
134+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
135+
},
136+
"allDeclaredFields": true,
137+
"queryAllDeclaredConstructors": true
138+
},
139+
{
140+
"name": "org.flywaydb.core.internal.command.clean.SchemaModel",
141+
"queryAllDeclaredMethods": true,
142+
"condition": {
143+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
144+
},
145+
"allDeclaredFields": true,
146+
"queryAllDeclaredConstructors": true
147+
},
148+
{
149+
"name": "org.flywaydb.core.internal.configuration.extensions.DeployScriptFilenameConfigurationExtension",
150+
"queryAllDeclaredMethods": true,
151+
"condition": {
152+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
153+
},
154+
"allDeclaredFields": true,
155+
"queryAllDeclaredConstructors": true,
156+
"methods": [
157+
{
158+
"name": "<init>",
159+
"parameterTypes": [
160+
]
161+
},
162+
{
163+
"name": "getScriptFilename",
164+
"parameterTypes": [
165+
]
166+
},
167+
{
168+
"name": "setScriptFilename",
169+
"parameterTypes": [
170+
"java.lang.String"
171+
]
172+
}
173+
]
174+
},
175+
{
176+
"name": "org.flywaydb.core.internal.configuration.extensions.PrepareScriptFilenameConfigurationExtension",
177+
"queryAllDeclaredMethods": true,
178+
"condition": {
179+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
180+
},
181+
"allDeclaredFields": true,
182+
"queryAllDeclaredConstructors": true,
183+
"methods": [
184+
{
185+
"name": "<init>",
186+
"parameterTypes": [
187+
]
188+
},
189+
{
190+
"name": "getScriptFilename",
191+
"parameterTypes": [
192+
]
193+
},
194+
{
195+
"name": "setScriptFilename",
196+
"parameterTypes": [
197+
"java.lang.String"
198+
]
199+
}
200+
]
201+
},
202+
{
203+
"name": "org.flywaydb.core.internal.proprietaryStubs.LicensingConfigurationExtensionStub",
204+
"condition": {
205+
"typeReachable": "org.flywaydb.core.api.configuration.ClassicConfiguration"
206+
},
207+
"allDeclaredFields": true
208+
},
209+
{
210+
"name": "org.flywaydb.core.internal.proprietaryStubs.PATTokenConfigurationExtensionStub",
211+
"condition": {
212+
"typeReachable": "org.flywaydb.core.api.configuration.ClassicConfiguration"
213+
},
214+
"allDeclaredFields": true
215+
},
216+
{
217+
"name": "org.flywaydb.core.internal.publishing.PublishingConfigurationExtension",
218+
"condition": {
219+
"typeReachable": "org.flywaydb.core.api.configuration.ClassicConfiguration"
220+
},
221+
"allDeclaredFields": true
222+
},
223+
{
224+
"name": "org.flywaydb.core.internal.publishing.PublishingConfigurationExtension",
225+
"queryAllDeclaredMethods": true,
226+
"condition": {
227+
"typeReachable": "org.flywaydb.core.extensibility.ConfigurationExtension"
228+
},
229+
"allDeclaredFields": true,
230+
"queryAllDeclaredConstructors": true,
231+
"methods": [
232+
{
233+
"name": "<init>",
234+
"parameterTypes": [
235+
]
236+
},
237+
{
238+
"name": "isPublishResult",
239+
"parameterTypes": [
240+
]
241+
},
242+
{
243+
"name": "setPublishResult",
244+
"parameterTypes": [
245+
"boolean"
246+
]
247+
}
248+
]
54249
}
55250
]

‎server/src/main/resources/db/dev/R__Load_testing_data.sql

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,19 +1699,29 @@ VALUES
16991699
('d27b679c-3aa8-4c4d-b08e-4eda63cea23f', '105f2968-a182-45a3-892c-eeff76383fe0', '06c03df3-85fe-4fc3-979e-9f1f6ba74a03', '5', '2022-08-01');
17001700

17011701
INSERT INTO kudos
1702-
(id, message, senderid, teamid, datecreated, dateapproved)
1702+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17031703
VALUES
1704-
('39dfd281-d0af-4016-848b-8156dfef2b92', PGP_SYM_ENCRYPT('Kudos to Revolver Ocelot!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2022-10-01', '2022-10-02');
1704+
('39dfd281-d0af-4016-848b-8156dfef2b93', PGP_SYM_ENCRYPT('Kudos to Revolver Ocelot!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2023-12-01', '2023-12-02', true);
1705+
1706+
INSERT INTO kudos_recipient
1707+
(id, kudosid, memberid)
1708+
VALUES
1709+
('ebc023e1-b577-4b02-a2fb-fc9472a8474b', '39dfd281-d0af-4016-848b-8156dfef2b93', '105f2968-a182-45a3-892c-eeff76383fe0');
1710+
1711+
INSERT INTO kudos
1712+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
1713+
VALUES
1714+
('39dfd281-d0af-4016-848b-8156dfef2b92', PGP_SYM_ENCRYPT('Kudos to Revolver Ocelot!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2022-10-01', null, true);
17051715

17061716
INSERT INTO kudos_recipient
17071717
(id, kudosid, memberid)
17081718
VALUES
17091719
('ebc023e1-b577-4b02-a2fb-fc9472a8474a', '39dfd281-d0af-4016-848b-8156dfef2b92', '105f2968-a182-45a3-892c-eeff76383fe0');
17101720

17111721
INSERT INTO kudos
1712-
(id, message, senderid, teamid, datecreated, dateapproved)
1722+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17131723
VALUES
1714-
('fbcde196-7703-4f80-ac5e-5ac60b28555e', PGP_SYM_ENCRYPT('Kudos to Huey and Awesome!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2022-10-01', null);
1724+
('fbcde196-7703-4f80-ac5e-5ac60b28555e', PGP_SYM_ENCRYPT('Kudos to Huey and Awesome!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-10-21', '2024-10-21', true);
17151725

17161726
INSERT INTO kudos_recipient
17171727
(id, kudosid, memberid)
@@ -1724,9 +1734,9 @@ VALUES
17241734
('bf37c244-f478-42b2-9077-dd4cb052bbb1', 'fbcde196-7703-4f80-ac5e-5ac60b28555e', '67dc3a3b-5bfa-4759-997a-fb6bac98dcf3');
17251735

17261736
INSERT INTO kudos
1727-
(id, message, senderid, teamid, datecreated, dateapproved)
1737+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17281738
VALUES
1729-
('df2766f0-efab-4925-859e-d993e2e38eaa', PGP_SYM_ENCRYPT('Kudos to the Checkins Experts team!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', 'a8733740-cf4c-4c16-a8cf-4f928c409acc', '2022-09-28', '2022-09-29');
1739+
('df2766f0-efab-4925-859e-d993e2e38eaa', PGP_SYM_ENCRYPT('Kudos to the Checkins Experts team!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', 'a8733740-cf4c-4c16-a8cf-4f928c409acc', '2024-09-28', '2024-09-29', true);
17301740

17311741
INSERT INTO kudos_recipient
17321742
(id, kudosid, memberid)
@@ -1744,19 +1754,19 @@ VALUES
17441754
('0ca86d55-cffb-4b84-883c-c4c2e41eff73', 'df2766f0-efab-4925-859e-d993e2e38eaa', '67dc3a3b-5bfa-4759-997a-fb6bac98dcf3');
17451755

17461756
INSERT INTO kudos
1747-
(id, message, senderid, teamid, datecreated, dateapproved)
1757+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17481758
VALUES
1749-
('17e19f16-d731-4242-a74a-43493a556f08', PGP_SYM_ENCRYPT('Kudos to Michael Kimberlin!', '${aeskey}'), 'a90be358-aa3d-49c8-945a-879a93646e45', null, '2022-08-15', '2022-08-25');
1759+
('17e19f16-d731-4242-a74a-43493a556f08', PGP_SYM_ENCRYPT('Kudos to Mischievous Kangaroo!', '${aeskey}'), 'a90be358-aa3d-49c8-945a-879a93646e45', null, '2024-11-01', null, true);
17501760

17511761
INSERT INTO kudos_recipient
17521762
(id, kudosid, memberid)
17531763
VALUES
17541764
('038485ee-8cac-416b-9da6-d838ee345d0e', '17e19f16-d731-4242-a74a-43493a556f08', 'e4b2fe52-1915-4544-83c5-21b8f871f6db');
17551765

17561766
INSERT INTO kudos
1757-
(id, message, senderid, teamid, datecreated, dateapproved)
1767+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17581768
VALUES
1759-
('6612b8a0-1d45-4155-b0fb-e0b2d9eaafcb', PGP_SYM_ENCRYPT('Wanted to give some kudos to Mischievous Kangaroo and Revolver Ocelot for their recent help on the project. Thank you very much!', '${aeskey}'), '1b4f99da-ef70-4a76-9b37-8bb783b749ad', null, '2022-10-05', null);
1769+
('6612b8a0-1d45-4155-b0fb-e0b2d9eaafcb', PGP_SYM_ENCRYPT('Wanted to give some kudos to Mischievous Kangaroo and Revolver Ocelot for their recent help on the project. Thank you very much!', '${aeskey}'), '1b4f99da-ef70-4a76-9b37-8bb783b749ad', null, '2024-10-29', '2024-10-29', true);
17601770

17611771
INSERT INTO kudos_recipient
17621772
(id, kudosid, memberid)
@@ -1769,9 +1779,9 @@ VALUES
17691779
('01f639d5-b7b3-47a2-b165-d7a20d01fec2', '6612b8a0-1d45-4155-b0fb-e0b2d9eaafcb', '105f2968-a182-45a3-892c-eeff76383fe0');
17701780

17711781
INSERT INTO kudos
1772-
(id, message, senderid, teamid, datecreated, dateapproved)
1782+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17731783
VALUES
1774-
('9cdce399-4c02-41ed-a63f-35beb6ecb622', PGP_SYM_ENCRYPT('A huge thank you to the Javascript Gurus team for offering their advice on the tech stack for the new project. Kudos to you all!', '${aeskey}'), '8d75c07e-6adc-437a-8659-7dd953ce6600', 'e8f052a8-40b5-4fb4-9bab-8b16ed36adc7', '2022-10-10', '2022-10-11');
1784+
('9cdce399-4c02-41ed-a63f-35beb6ecb622', PGP_SYM_ENCRYPT('A huge thank you to the Javascript Gurus team for offering their advice on the tech stack for the new project. Kudos to you all!', '${aeskey}'), '8d75c07e-6adc-437a-8659-7dd953ce6600', 'e8f052a8-40b5-4fb4-9bab-8b16ed36adc7', '2022-10-10', '2022-10-11', true);
17751785

17761786
INSERT INTO kudos_recipient
17771787
(id, kudosid, memberid)
@@ -1789,19 +1799,19 @@ VALUES
17891799
('f792056b-22ce-4e3d-a442-0fdc3cb35e7b', '9cdce399-4c02-41ed-a63f-35beb6ecb622', '105f2968-a182-45a3-892c-eeff76383fe0');
17901800

17911801
INSERT INTO kudos
1792-
(id, message, senderid, teamid, datecreated, dateapproved)
1802+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17931803
VALUES
1794-
('39dfd284-d0bf-4017-848c-8156dfef2b93', PGP_SYM_ENCRYPT('Kudos are tasty.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-09-04', '2022-09-04');
1804+
('39dfd284-d0bf-4017-848c-8156dfef2b93', PGP_SYM_ENCRYPT('Kudos are tasty.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-11-10', '2024-11-10', true);
17951805

17961806
INSERT INTO kudos_recipient
17971807
(id, kudosid, memberid)
17981808
VALUES
17991809
('ebc023e2-b578-4b03-a2fc-fc9472a8474b', '39dfd284-d0bf-4017-848c-8156dfef2b93', 'c7406157-a38f-4d48-aaed-04018d846727');
18001810

18011811
INSERT INTO kudos
1802-
(id, message, senderid, teamid, datecreated, dateapproved)
1812+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
18031813
VALUES
1804-
('39dfd284-d0bf-4017-848c-8156dfef2b94', PGP_SYM_ENCRYPT('Kudos are covered in chocolate.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-09-04', '2022-09-04');
1814+
('39dfd284-d0bf-4017-848c-8156dfef2b94', PGP_SYM_ENCRYPT('Kudos are covered in chocolate.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-09-04', '2022-09-04', true);
18051815

18061816
INSERT INTO kudos_recipient
18071817
(id, kudosid, memberid)

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

Lines changed: 8 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
@@ -59,6 +63,8 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
5963
}
6064

6165
default LocalDate getRandomLocalDateTime(LocalDateTime start, LocalDateTime end) {
66+
if(start.isEqual(end)) return end.toLocalDate();
67+
6268
LocalDate startDate = start.toLocalDate();
6369
long daysBetween = ChronoUnit.DAYS.between(startDate, end.toLocalDate());
6470
Random random = new Random();
@@ -81,6 +87,8 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
8187

8288
default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberProfile requestee, MemberProfile recipient, UUID templateId, ReviewPeriod reviewPeriod, String status) {
8389
LocalDate submitDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), reviewPeriod.getCloseDate());
90+
LOG.info("Period start date: {} Generated Submit Date: {}", reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
91+
if(submitDate.atStartOfDay().isAfter(LocalDateTime.now())) submitDate = LocalDateTime.now().toLocalDate();
8492
LocalDate sendDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
8593
return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), recipient.getId(), templateId, sendDate, null, status, submitDate, reviewPeriod.getId()));
8694
}

0 commit comments

Comments
 (0)