fix: Enrolment notification in new capture app[DHIS2-15724] (#15327) (#…

…15567)
dhis2 · Nov 2, 2023 · cbf7cff · cbf7cff
1 parent 6a8fd88
commit cbf7cff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/DefaultTrackerImportService.java b/...dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/DefaultTrackerImportService.java
@@ -61,7 +61,6 @@
 import org.hisp.dhis.tracker.validation.TrackerValidationService;
 import org.hisp.dhis.user.User;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Morten Olav Hansen <[email protected]>
@@ -81,7 +80,6 @@ public class DefaultTrackerImportService implements TrackerImportService {
   @NonNull private final Notifier notifier;
 
   @Override
-  @Transactional
   public TrackerImportReport importTracker(TrackerImportParams params) {
     User user = trackerUserService.getUser(params.getUserId());
     params.setUser(user);

diff --git a/...s-service-tracker/src/main/java/org/hisp/dhis/tracker/preheat/mappers/FullUserMapper.java b/...s-service-tracker/src/main/java/org/hisp/dhis/tracker/preheat/mappers/FullUserMapper.java
@@ -31,13 +31,20 @@
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserGroup;
+import org.hisp.dhis.user.UserRole;
 import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(uses = {DebugMapper.class, OrganisationUnitMapper.class, UserGroupMapper.class})
+@Mapper(
+    uses = {
+      DebugMapper.class,
+      OrganisationUnitMapper.class,
+      UserGroupMapper.class,
+      UserRoleMapper.class
+    })
 public interface FullUserMapper extends PreheatMapper<User> {
   FullUserMapper INSTANCE = Mappers.getMapper(FullUserMapper.class);
 
@@ -63,4 +70,6 @@ public interface FullUserMapper extends PreheatMapper<User> {
 
   @Named("groups")
   Set<UserGroup> groups(Set<UserGroup> groups);
+
+  Set<UserRole> map(Set<UserRole> userRoles);
 }