Skip to content

Commit 8a9119a

Browse files
obinna-h-nobinna-h-n
committed
update sormas_schema.sql for aefi module, fix tests, update user rights in web descriptors
1 parent 6efd99d commit 8a9119a

File tree

20 files changed

+637
-27
lines changed

20 files changed

+637
-27
lines changed

‎sormas-api/src/main/java/de/symeda/sormas/api/dashboard/adverseeventsfollowingimmunization/AefiChartData.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
/*
22
* SORMAS® - Surveillance Outbreak Response Management & Analysis System
33
* Copyright © 2016-2024 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
4-
*
54
* This program is free software: you can redistribute it and/or modify
65
* it under the terms of the GNU General Public License as published by
76
* the Free Software Foundation, either version 3 of the License, or
87
* (at your option) any later version.
9-
*
108
* This program is distributed in the hope that it will be useful,
119
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1210
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1311
* GNU General Public License for more details.
14-
*
1512
* You should have received a copy of the GNU General Public License
1613
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1714
*/
@@ -22,6 +19,9 @@
2219
import java.util.ArrayList;
2320
import java.util.List;
2421

22+
import de.symeda.sormas.api.audit.AuditedClass;
23+
24+
@AuditedClass
2525
public class AefiChartData implements Serializable {
2626

2727
private static final long serialVersionUID = 3538219674050390425L;

‎sormas-api/src/main/java/de/symeda/sormas/api/importexport/DatabaseTable.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ public enum DatabaseTable {
6868
IMMUNIZATIONS(DatabaseTableType.SORMAS, "immunizations", dependingOnFeature(FeatureType.IMMUNIZATION_MANAGEMENT)),
6969
VACCINATIONS(DatabaseTableType.SORMAS, IMMUNIZATIONS, "vaccinations"),
7070

71+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS(DatabaseTableType.SORMAS,
72+
"adverse_events_following_immunizations",
73+
dependingOnFeature(FeatureType.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_MANAGEMENT)),
74+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS(DatabaseTableType.SORMAS,
75+
"adverse_events_following_immunization_investigations",
76+
dependingOnFeature(FeatureType.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_MANAGEMENT)),
77+
ADVERSE_EVENTS(DatabaseTableType.SORMAS, "adverse_events", dependingOnFeature(FeatureType.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_MANAGEMENT)),
78+
7179
SAMPLES(DatabaseTableType.SORMAS, "samples", dependingOnFeature(FeatureType.SAMPLES_LAB)),
7280
PATHOGEN_TESTS(DatabaseTableType.SORMAS, SAMPLES, "pathogen_tests"),
7381
ADDITIONAL_TESTS(DatabaseTableType.SORMAS, SAMPLES, "additional_tests", dependingOnFeature(FeatureType.ADDITIONAL_TESTS)),

‎sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,13 @@ public Set<UserRight> getDefaultUserRights() {
304304
IMMUNIZATION_DELETE,
305305
IMMUNIZATION_ARCHIVE,
306306
IMMUNIZATION_VIEW_ARCHIVED,
307+
DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW,
308+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE,
309+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW,
310+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT,
311+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE,
312+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE,
313+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT,
307314
PERSON_VIEW,
308315
PERSON_EDIT,
309316
PERSON_DELETE,
@@ -1315,6 +1322,13 @@ public Set<UserRight> getDefaultUserRights() {
13151322
IMMUNIZATION_CREATE,
13161323
IMMUNIZATION_EDIT,
13171324
IMMUNIZATION_DELETE,
1325+
DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW,
1326+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE,
1327+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW,
1328+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT,
1329+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE,
1330+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE,
1331+
ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT,
13181332
PERSON_VIEW,
13191333
PERSON_EDIT,
13201334
PERSON_DELETE,

‎sormas-backend/src/main/java/de/symeda/sormas/backend/adverseeventsfollowingimmunization/entity/Aefi.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import javax.persistence.ManyToMany;
3333
import javax.persistence.ManyToOne;
3434
import javax.persistence.OneToOne;
35-
import javax.persistence.Table;
3635
import javax.persistence.Temporal;
3736
import javax.persistence.TemporalType;
3837

@@ -53,8 +52,7 @@
5352
import de.symeda.sormas.backend.user.User;
5453
import de.symeda.sormas.backend.vaccination.Vaccination;
5554

56-
@Entity
57-
@Table(name = "adverseeventsfollowingimmunization")
55+
@Entity(name = "adverseeventsfollowingimmunization")
5856
public class Aefi extends CoreAdo {
5957

6058
private static final long serialVersionUID = -7845660472641846292L;

‎sormas-backend/src/main/java/de/symeda/sormas/backend/adverseeventsfollowingimmunization/entity/AefiInvestigation.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import javax.persistence.ManyToMany;
3333
import javax.persistence.ManyToOne;
3434
import javax.persistence.OneToOne;
35-
import javax.persistence.Table;
3635
import javax.persistence.Temporal;
3736
import javax.persistence.TemporalType;
3837
import javax.persistence.Transient;
@@ -66,8 +65,7 @@
6665
import de.symeda.sormas.backend.user.User;
6766
import de.symeda.sormas.backend.vaccination.Vaccination;
6867

69-
@Entity
70-
@Table(name = "adverseeventsfollowingimmunizationinvestigation")
68+
@Entity(name = "adverseeventsfollowingimmunizationinvestigation")
7169
public class AefiInvestigation extends CoreAdo {
7270

7371
private static final long serialVersionUID = 6128204752074963848L;

‎sormas-backend/src/main/resources/META-INF/glassfish-ejb-jar.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,36 @@
122122
<group-name>IMMUNIZATION_ARCHIVE</group-name>
123123
</security-role-mapping>
124124

125+
<security-role-mapping>
126+
<role-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW</role-name>
127+
<group-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW</group-name>
128+
</security-role-mapping>
129+
130+
<security-role-mapping>
131+
<role-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE</role-name>
132+
<group-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE</group-name>
133+
</security-role-mapping>
134+
135+
<security-role-mapping>
136+
<role-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT</role-name>
137+
<group-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT</group-name>
138+
</security-role-mapping>
139+
140+
<security-role-mapping>
141+
<role-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE</role-name>
142+
<group-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE</group-name>
143+
</security-role-mapping>
144+
145+
<security-role-mapping>
146+
<role-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE</role-name>
147+
<group-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE</group-name>
148+
</security-role-mapping>
149+
150+
<security-role-mapping>
151+
<role-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT</role-name>
152+
<group-name>ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT</group-name>
153+
</security-role-mapping>
154+
125155
<security-role-mapping>
126156
<role-name>PERSON_VIEW</role-name>
127157
<group-name>PERSON_VIEW</group-name>
@@ -607,6 +637,11 @@
607637
<group-name>DASHBOARD_SAMPLES_VIEW</group-name>
608638
</security-role-mapping>
609639

640+
<security-role-mapping>
641+
<role-name>DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW</role-name>
642+
<group-name>DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW</group-name>
643+
</security-role-mapping>
644+
610645
<security-role-mapping>
611646
<role-name>CASE_CLINICIAN_VIEW</role-name>
612647
<group-name>CASE_CLINICIAN_VIEW</group-name>

0 commit comments

Comments
 (0)