|
6 | 6 | import org.avni.server.application.OrganisationConfigSettingKey; |
7 | 7 | import org.avni.server.dao.ConceptRepository; |
8 | 8 | import org.avni.server.dao.OrganisationConfigRepository; |
| 9 | +import org.avni.server.dao.SubjectTypeRepository; |
9 | 10 | import org.avni.server.domain.*; |
10 | 11 | import org.avni.server.framework.security.UserContextHolder; |
11 | 12 | import org.avni.server.projection.ConceptProjection; |
@@ -40,17 +41,20 @@ public class OrganisationConfigService implements NonScopeAwareService { |
40 | 41 | private final ProjectionFactory projectionFactory; |
41 | 42 | private final ConceptRepository conceptRepository; |
42 | 43 | private final LocationHierarchyService locationHierarchyService; |
| 44 | + private final SubjectTypeRepository subjectTypeRepository; |
43 | 45 | private final ObjectMapper objectMapper; |
44 | 46 |
|
45 | 47 | @Autowired |
46 | 48 | public OrganisationConfigService(OrganisationConfigRepository organisationConfigRepository, |
47 | 49 | ProjectionFactory projectionFactory, |
48 | 50 | ConceptRepository conceptRepository, |
49 | | - @Lazy LocationHierarchyService locationHierarchyService) { |
| 51 | + @Lazy LocationHierarchyService locationHierarchyService, |
| 52 | + SubjectTypeRepository subjectTypeRepository) { |
50 | 53 | this.organisationConfigRepository = organisationConfigRepository; |
51 | 54 | this.projectionFactory = projectionFactory; |
52 | 55 | this.conceptRepository = conceptRepository; |
53 | 56 | this.locationHierarchyService = locationHierarchyService; |
| 57 | + this.subjectTypeRepository = subjectTypeRepository; |
54 | 58 | this.objectMapper = ObjectMapperSingleton.getObjectMapper(); |
55 | 59 | } |
56 | 60 |
|
@@ -118,6 +122,7 @@ public LinkedHashMap<String, Object> getOrganisationSettings(Long organisationId |
118 | 122 | .collect(Collectors.toList()); |
119 | 123 | organisationSettingsConceptListMap.put("organisationConfig", settings); |
120 | 124 | organisationSettingsConceptListMap.put("conceptList", conceptList); |
| 125 | + organisationSettingsConceptListMap.put("isNewImplementation", subjectTypeRepository.findAllOperational().isEmpty()); |
121 | 126 | return organisationSettingsConceptListMap; |
122 | 127 | } |
123 | 128 |
|
|
0 commit comments