Merge remote-tracking branch 'origin/9.0' into 9.0

Author: himeshr

avni-server-api/src/main/java/org/avni/server/service/OrganisationService.java

@@ -137,6 +137,7 @@ public class OrganisationService {
     private final OrganisationConfigService organisationConfigService;
     private final GenderRepository genderRepository;
     private final OrganisationRepository organisationRepository;
+    private final UserSubjectRepository userSubjectRepository;
     private final Logger logger;
 
     @Autowired
@@ -213,7 +214,8 @@ public OrganisationService(FormRepository formRepository,
                                MessageReceiverRepository messageReceiverRepository,
                                OrganisationConfigService organisationConfigService,
                                GenderRepository genderRepository,
-                               OrganisationRepository organisationRepository) {
+                               OrganisationRepository organisationRepository,
+                               UserSubjectRepository userSubjectRepository) {
         this.formRepository = formRepository;
         this.addressLevelTypeRepository = addressLevelTypeRepository;
         this.locationRepository = locationRepository;
@@ -289,6 +291,7 @@ public OrganisationService(FormRepository formRepository,
         this.organisationConfigService = organisationConfigService;
         this.genderRepository = genderRepository;
         this.organisationRepository = organisationRepository;
+        this.userSubjectRepository = userSubjectRepository;
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
@@ -673,6 +676,7 @@ public void deleteTransactionalData() {
             userSubjectAssignmentRepository,
             subjectProgramEligibilityRepository,
             taskRepository,
+            userSubjectRepository,
             individualRepository
         };