This repository was archived by the owner on May 5, 2021. It is now read-only.
File tree Expand file tree Collapse file tree
sormas-api/src/main/java/de/symeda/sormas/api/user
sormas-backend/src/main/java/de/symeda/sormas/backend/bagexport
sormas-rest/src/main/java/de/symeda/sormas/rest Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -93,6 +93,7 @@ public enum UserRole
9393 public static final String _REST_EXTERNAL_VISITS_USER = REST_EXTERNAL_VISITS_USER .name ();
9494 public static final String _REST_USER = REST_USER .name ();
9595 public static final String _SORMAS_TO_SORMAS_CLIENT = "SORMAS_TO_SORMAS_CLIENT" ;
96+ public static final String _BAG_USER = "BAG_USER" ;
9697
9798 private Set <UserRight > defaultUserRights = null ;
9899
@@ -221,6 +222,9 @@ public void addAssignableRoles(Collection<UserRole> collection) {
221222 case SORMAS_TO_SORMAS_CLIENT :
222223 collection .add (SORMAS_TO_SORMAS_CLIENT );
223224 break ;
225+ case BAG_USER :
226+ collection .add (BAG_USER );
227+ break ;
224228 default :
225229 break ;
226230 }
Original file line number Diff line number Diff line change 2525import java .util .Optional ;
2626import java .util .stream .Collectors ;
2727
28- import javax .ejb .EJB ;
2928import javax .ejb .LocalBean ;
3029import javax .ejb .Stateless ;
3130import javax .persistence .EntityManager ;
4544import de .symeda .sormas .api .sample .PathogenTestResultType ;
4645import de .symeda .sormas .api .utils .YesNoUnknown ;
4746import de .symeda .sormas .backend .caze .Case ;
48- import de .symeda .sormas .backend .common .ConfigFacadeEjb .ConfigFacadeEjbLocal ;
4947import de .symeda .sormas .backend .contact .Contact ;
5048import de .symeda .sormas .backend .contact .ContactJoins ;
5149import de .symeda .sormas .backend .location .Location ;
@@ -64,9 +62,6 @@ public class BAGExportFacadeEjb implements BAGExportFacade {
6462 @ PersistenceContext (unitName = ModelConstants .PERSISTENCE_UNIT_NAME )
6563 private EntityManager em ;
6664
67- @ EJB
68- private ConfigFacadeEjbLocal configFacade ;
69-
7065 @ Override
7166 public List <BAGExportCaseDto > getCaseExportList (int first , int max ) {
7267 CriteriaBuilder cb = em .getCriteriaBuilder ();
Original file line number Diff line number Diff line change 3131import de .symeda .sormas .api .FacadeProvider ;
3232import de .symeda .sormas .api .bagexport .BAGExportCaseDto ;
3333import de .symeda .sormas .api .bagexport .BAGExportContactDto ;
34+ import de .symeda .sormas .api .user .UserRole ;
3435import de .symeda .sormas .api .utils .CsvStreamUtils ;
3536import de .symeda .sormas .api .utils .DateHelper ;
3637
3738@ Path ("/bagexport" )
3839@ Produces (MediaType .APPLICATION_OCTET_STREAM )
3940@ Consumes (MediaType .APPLICATION_JSON + "; charset=UTF-8" )
4041@ RolesAllowed ({
41- "BAG_USER" })
42+ UserRole . _BAG_USER })
4243public class BAGExportResource {
4344
4445 @ GET
You can’t perform that action at this time.
0 commit comments