Skip to content

Commit e75b1e5

Browse files
ocielliottcocielliottc
committed
Merge branch 'develop' into bugfix-2672/address-test-warnings
2 parents 46651dc + 0e22e64 commit e75b1e5

File tree

11 files changed

+361
-102
lines changed

11 files changed

+361
-102
lines changed

‎server/src/main/java/com/objectcomputing/checkins/services/memberprofile/anniversaryreport/AnniversaryReportServicesImpl.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.objectcomputing.checkins.exceptions.PermissionException;
44
import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
55
import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
6-
import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
76
import io.micronaut.core.annotation.Nullable;
87
import jakarta.inject.Singleton;
98

@@ -18,20 +17,13 @@
1817
public class AnniversaryReportServicesImpl implements AnniversaryServices {
1918

2019
private final MemberProfileServices memberProfileServices;
21-
private final CurrentUserServices currentUserServices;
2220

23-
public AnniversaryReportServicesImpl(MemberProfileServices memberProfileServices,
24-
CurrentUserServices currentUserServices) {
21+
public AnniversaryReportServicesImpl(MemberProfileServices memberProfileServices) {
2522
this.memberProfileServices = memberProfileServices;
26-
this.currentUserServices = currentUserServices;
2723
}
2824

2925
@Override
3026
public List<AnniversaryReportResponseDTO> findByValue(@Nullable String[] months) {
31-
if (!currentUserServices.isAdmin()) {
32-
throw new PermissionException("You do not have permission to access this resource.");
33-
}
34-
3527
List<MemberProfile> memberProfileAll = new ArrayList<>();
3628
Set<MemberProfile> memberProfiles = memberProfileServices.findByValues(null, null, null, null, null, null,
3729
false);

‎server/src/main/java/com/objectcomputing/checkins/services/memberprofile/birthday/BirthDayServicesImpl.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.objectcomputing.checkins.exceptions.PermissionException;
44
import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
55
import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
6-
import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
76

87
import jakarta.inject.Singleton;
98
import java.time.LocalDate;
@@ -15,19 +14,13 @@
1514
public class BirthDayServicesImpl implements BirthDayServices{
1615

1716
private final MemberProfileServices memberProfileServices;
18-
private final CurrentUserServices currentUserServices;
1917

20-
public BirthDayServicesImpl(MemberProfileServices memberProfileServices, CurrentUserServices currentUserServices) {
18+
public BirthDayServicesImpl(MemberProfileServices memberProfileServices) {
2119
this.memberProfileServices = memberProfileServices;
22-
this.currentUserServices = currentUserServices;
2320
}
2421

2522
@Override
2623
public List<BirthDayResponseDTO> findByValue(String[] months, Integer[] daysOfMonth) {
27-
if (!currentUserServices.isAdmin()) {
28-
throw new PermissionException("You do not have permission to access this resource.");
29-
}
30-
3124
Set<MemberProfile> memberProfiles = memberProfileServices.findByValues(null, null, null, null, null, null, false);
3225
List<MemberProfile> memberProfileAll = new ArrayList<>(memberProfiles);
3326
if (months != null) {

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

Lines changed: 43 additions & 33 deletions
Large diffs are not rendered by default.

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

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
delete from feedback_answers where request_id in (select id from feedback_requests where template_id in ('b4d408e8-182e-4aab-830e-57596edf9a7f', 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea'));
2+
delete from feedback_requests where template_id in ('b4d408e8-182e-4aab-830e-57596edf9a7f', 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea');
3+
delete from review_periods where review_template_id in ('b4d408e8-182e-4aab-830e-57596edf9a7f', 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea');
4+
delete from review_periods where self_review_template_id in ('b4d408e8-182e-4aab-830e-57596edf9a7f', 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea');
5+
delete from template_questions where template_id in ('b4d408e8-182e-4aab-830e-57596edf9a7f', 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea');
6+
delete from feedback_templates where id in ('b4d408e8-182e-4aab-830e-57596edf9a7f', 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea');
7+
8+
---- Self Review - 2024
9+
INSERT INTO feedback_templates
10+
(id, title, description, creator_id, date_created, active, is_public, is_ad_hoc, is_review) -- created by: Mischievous Kangaroo
11+
VALUES
12+
('b4d408e8-182e-4aab-830e-57596edf9a7f', 'Self Review - 2024', 'This survey is intended for performance self-review.', 'e4b2fe52-1915-4544-83c5-21b8f871f6db', '2022-11-01', true, true, false, true);
13+
14+
INSERT INTO template_questions
15+
(id, question, template_id, question_number, input_type)
16+
VALUES
17+
('aa9e97b8-1b25-4ee1-a337-3e821802a969', PGP_SYM_ENCRYPT('Individual Performance and Contributions', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 1, 'NONE');
18+
19+
INSERT INTO template_questions
20+
(id, question, template_id, question_number, input_type)
21+
VALUES
22+
('3451bb90-8b61-46f1-b991-fb98b6871f94', PGP_SYM_ENCRYPT('My performance (contributions, knowledge, & skill) was strong during the period covered by this review.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 2, 'SLIDER');
23+
24+
INSERT INTO template_questions
25+
(id, question, template_id, question_number, input_type)
26+
VALUES
27+
('6330a931-840f-4402-8a4b-78f17af731d2', PGP_SYM_ENCRYPT('During the period covered by this review, I demonstrated a commitment to ensuring an exceptional client experience wherever possible.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 3, 'SLIDER');
28+
29+
INSERT INTO template_questions
30+
(id, question, template_id, question_number, input_type)
31+
VALUES
32+
('ec93ef57-bec6-40b4-98c5-7ba72639294a', PGP_SYM_ENCRYPT('Can you please share any qualities, behaviors, or examples that demonstrate your effectiveness as an individual contributor during this period?', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 4, 'TEXT');
33+
34+
INSERT INTO template_questions
35+
(id, question, template_id, question_number, input_type)
36+
VALUES
37+
('f1f00c55-4a57-42fe-8024-2e87cec1e877', PGP_SYM_ENCRYPT('Can you please share, if applicable, anything that you feel may be holding you back from being a more effective individual contributor?', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 5, 'TEXT');
38+
39+
INSERT INTO template_questions
40+
(id, question, template_id, question_number, input_type)
41+
VALUES
42+
('991f4b96-a9ed-4a5a-b405-3d0ebc69bba7', PGP_SYM_ENCRYPT('Team Collaboration and Leadership', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 6, 'NONE');
43+
44+
INSERT INTO template_questions
45+
(id, question, template_id, question_number, input_type)
46+
VALUES
47+
('e3248688-fd26-4c8c-9110-af0b760c2e55', PGP_SYM_ENCRYPT('I openly welcome collaboration and input where appropriate.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 7, 'SLIDER');
48+
49+
INSERT INTO template_questions
50+
(id, question, template_id, question_number, input_type)
51+
VALUES
52+
('e951a8db-7f87-4d35-8419-d06dc7687eba', PGP_SYM_ENCRYPT('I frequently seek to share with and uplift other members of our OCI team.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 8, 'SLIDER');
53+
54+
INSERT INTO template_questions
55+
(id, question, template_id, question_number, input_type)
56+
VALUES
57+
('88140f0d-659f-4340-a9b3-4c6130327ed1', PGP_SYM_ENCRYPT('I have led or helped supported the personal or professional growth of other members of our OCI team during the period covered by this review.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 9, 'SLIDER');
58+
59+
INSERT INTO template_questions
60+
(id, question, template_id, question_number, input_type)
61+
VALUES
62+
('e080a8ff-7bce-4a5b-bf29-645266548e73', PGP_SYM_ENCRYPT('During the period covered by this review, I demonstrated a commitment to ensuring an exceptional experience for our fellow team members wherever possible.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 10, 'SLIDER');
63+
64+
INSERT INTO template_questions
65+
(id, question, template_id, question_number, input_type)
66+
VALUES
67+
('fdad94b8-f91c-4cd5-9265-526a50a4d9c7', PGP_SYM_ENCRYPT('Can you please share any qualities, behaviors, or examples that demonstrate your effectiveness as a collaborator or leader during this period?', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 11, 'TEXT');
68+
69+
INSERT INTO template_questions
70+
(id, question, template_id, question_number, input_type)
71+
VALUES
72+
('002bac4a-ad06-4fd1-a565-7cb300a7532c', PGP_SYM_ENCRYPT('Can you please share, if applicable, anything that you feel may be holding you back from being a more effective collaborator or leader?', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 12, 'TEXT');
73+
74+
INSERT INTO template_questions
75+
(id, question, template_id, question_number, input_type)
76+
VALUES
77+
('c4f0278c-7a53-4b40-8819-72f6d330aaf3', PGP_SYM_ENCRYPT('Commitment to Our Business', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 13, 'NONE');
78+
79+
INSERT INTO template_questions
80+
(id, question, template_id, question_number, input_type)
81+
VALUES
82+
('d539e697-c957-4afe-a07f-19a1dd4295e5', PGP_SYM_ENCRYPT('Please share how you have demonstrated a commitment to our business during the period covered by this review (e.g., impacting our reputation and goodwill in the community, impacting revenue growth, etc.).', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 14, 'TEXT');
83+
84+
INSERT INTO template_questions
85+
(id, question, template_id, question_number, input_type)
86+
VALUES
87+
('7820e3ed-9157-4cc2-9691-750c4c7f5a31', PGP_SYM_ENCRYPT('Citizenship and Values', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 15, 'NONE');
88+
89+
INSERT INTO template_questions
90+
(id, question, template_id, question_number, input_type)
91+
VALUES
92+
('5d48c2aa-3c0a-43fb-95e3-e717b368ff89', PGP_SYM_ENCRYPT('Please share how you have demonstrated a commitment to our values during the period covered by this review (i.e. all of us is better than any one of us, innovate courageously and mindfully, share it back).', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 16, 'TEXT');
93+
94+
INSERT INTO template_questions
95+
(id, question, template_id, question_number, input_type)
96+
VALUES
97+
('675e63dc-b5c8-47c2-bf28-6fb627dedefe', PGP_SYM_ENCRYPT('Please provide any additional information or context that you feel would be helpful in assessing your performance for the period covered by this review.', '${aeskey}'), 'b4d408e8-182e-4aab-830e-57596edf9a7f', 17, 'TEXT');
98+
99+
---- Annual Review - 2024
100+
INSERT INTO feedback_templates
101+
(id, title, description, creator_id, date_created, active, is_public, is_ad_hoc, is_review) -- created by: Big Boss
102+
VALUES
103+
('e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 'Annual Review - 2024', 'This survey is intended for performance review.', 'e4b2fe52-1915-4544-83c5-21b8f871f6db', '2022-11-21', true, true, false, true);
104+
105+
INSERT INTO template_questions
106+
(id, question, template_id, question_number, input_type)
107+
VALUES
108+
('e2c68178-9b24-4dba-bd2b-55ca4c82c8b2', PGP_SYM_ENCRYPT('Individual Performance and Contributions', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 1, 'NONE');
109+
110+
INSERT INTO template_questions
111+
(id, question, template_id, question_number, input_type)
112+
VALUES
113+
('3c62cc59-49ea-4ac6-b53f-ac784a7f7067', PGP_SYM_ENCRYPT('This team member''s performance (contributions, knowledge, & skill) was strong during the period covered by this review.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 2, 'SLIDER');
114+
115+
INSERT INTO template_questions
116+
(id, question, template_id, question_number, input_type)
117+
VALUES
118+
('ddb5ea1b-6146-4e52-9c25-ec4c9b8a92af', PGP_SYM_ENCRYPT('This team member''s potential to contribute is high.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 3, 'SLIDER');
119+
120+
INSERT INTO template_questions
121+
(id, question, template_id, question_number, input_type)
122+
VALUES
123+
('8ecce381-2e39-4f33-8ead-d62d364b5891', PGP_SYM_ENCRYPT('During the period covered by this review, this team member demonstrated a commitment to ensuring an exceptional client experience wherever possible.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 4, 'SLIDER');
124+
125+
INSERT INTO template_questions
126+
(id, question, template_id, question_number, input_type)
127+
VALUES
128+
('59e8c428-8970-4ccb-a5af-2dd9d5f5a4e1', PGP_SYM_ENCRYPT('Can you please share any qualities, behaviors, or examples that demonstrate this team member''s effectiveness as an individual contributor during this period?', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 5, 'TEXT');
129+
130+
INSERT INTO template_questions
131+
(id, question, template_id, question_number, input_type)
132+
VALUES
133+
('dddd120d-5c7c-4689-9f19-38980d650de1', PGP_SYM_ENCRYPT('Can you please share any qualities or behaviors, if applicable, that may be holding this person back from being a more effective individual contributor?', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 6, 'TEXT');
134+
135+
INSERT INTO template_questions
136+
(id, question, template_id, question_number, input_type)
137+
VALUES
138+
('3d4f3ff6-517d-48bd-986e-e4c156e84e51', PGP_SYM_ENCRYPT('Team Collaboration and Leadership', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 7, 'NONE');
139+
140+
INSERT INTO template_questions
141+
(id, question, template_id, question_number, input_type)
142+
VALUES
143+
('518ba915-a44c-4b0d-815f-ae8abc5e3b24', PGP_SYM_ENCRYPT('This team member welcomes collaboration and input where appropriate.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 8, 'SLIDER');
144+
145+
INSERT INTO template_questions
146+
(id, question, template_id, question_number, input_type)
147+
VALUES
148+
('475a8e17-3cab-45c3-8da5-586ee6bd212e', PGP_SYM_ENCRYPT('This team member frequently seeks to share with and uplift other members of our OCI team.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 9, 'SLIDER');
149+
150+
INSERT INTO template_questions
151+
(id, question, template_id, question_number, input_type)
152+
VALUES
153+
('8e424109-0624-47aa-a9b5-907ed02c5b03', PGP_SYM_ENCRYPT('This team member has led or helped support the personal or professional growth of other members of our OCI team during the period covered by this review.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 10, 'SLIDER');
154+
155+
INSERT INTO template_questions
156+
(id, question, template_id, question_number, input_type)
157+
VALUES
158+
('bc0ad36b-b7ed-4c67-8d0b-94d9907d31f8', PGP_SYM_ENCRYPT('During the period covered by this review, this team member demonstrated a commitment to ensuring an exceptional experience for our fellow team members wherever possible.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 11, 'SLIDER');
159+
160+
INSERT INTO template_questions
161+
(id, question, template_id, question_number, input_type)
162+
VALUES
163+
('1bc42e13-df19-42dd-8734-46b42e461425', PGP_SYM_ENCRYPT('Can you please share any qualities, behaviors, or examples that demonstrate this team member''s effectiveness as a collaborator or leader during this period?', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 12, 'TEXT');
164+
165+
INSERT INTO template_questions
166+
(id, question, template_id, question_number, input_type)
167+
VALUES
168+
('d3bc80fc-82e4-4793-b2c1-116d7b967b3d', PGP_SYM_ENCRYPT('Can you please share any qualities or behaviors, if applicable, that may be holding this person back from being a more effective collaborator or leader?', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 13, 'TEXT');
169+
170+
INSERT INTO template_questions
171+
(id, question, template_id, question_number, input_type)
172+
VALUES
173+
('bf18b24a-ff31-4def-a07d-7f60a6985bc5', PGP_SYM_ENCRYPT('Commitment to Our Business', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 14, 'NONE');
174+
175+
INSERT INTO template_questions
176+
(id, question, template_id, question_number, input_type)
177+
VALUES
178+
('98b34fdb-7ac5-4902-9d5b-d91bb35c591f', PGP_SYM_ENCRYPT('Please share how this team member has demonstrated a commitment to our business during the period covered by this review (e.g., impacting our reputation and goodwill in the community, impacting revenue growth, etc.).', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 15, 'TEXT');
179+
180+
INSERT INTO template_questions
181+
(id, question, template_id, question_number, input_type)
182+
VALUES
183+
('2c5e8ecf-5531-4356-8688-dd6c481552f5', PGP_SYM_ENCRYPT('Citizenship and Values', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 16, 'NONE');
184+
185+
INSERT INTO template_questions
186+
(id, question, template_id, question_number, input_type)
187+
VALUES
188+
('af5bcbec-8367-4a24-b579-b18151fe435c', PGP_SYM_ENCRYPT('Please share how this team member has demonstrated a commitment to our values during the period covered by this review (i.e. all of us is better than any one of us, innovate courageously and mindfully, share it back).', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 17, 'TEXT');
189+
190+
INSERT INTO template_questions
191+
(id, question, template_id, question_number, input_type)
192+
VALUES
193+
('d41656e0-a5a9-4d28-a107-31ea171ad044', PGP_SYM_ENCRYPT('Please provide any additional information or context that you feel would be helpful in assessing this team member''s performance for the period covered by this review.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 18, 'TEXT');
194+
195+
INSERT INTO template_questions
196+
(id, question, template_id, question_number, input_type)
197+
VALUES
198+
('4e3bed99-c3fb-4445-a9cf-89098119ef15', PGP_SYM_ENCRYPT('This team member should be considered for a promotion.', '${aeskey}'), 'e5d22b5d-c23e-40dc-9e95-057b9876a0ea', 19, 'RADIO');

0 commit comments

Comments
 (0)