Skip to content

Commit 6a71776

Browse files
committed
avniproject/avni-webapp#1618 | Added isNewImplementation key to organisationconfig endpoint
1 parent 6265a19 commit 6a71776

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.avni.server.application.OrganisationConfigSettingKey;
77
import org.avni.server.dao.ConceptRepository;
88
import org.avni.server.dao.OrganisationConfigRepository;
9+
import org.avni.server.dao.SubjectTypeRepository;
910
import org.avni.server.domain.*;
1011
import org.avni.server.framework.security.UserContextHolder;
1112
import org.avni.server.projection.ConceptProjection;
@@ -40,17 +41,20 @@ public class OrganisationConfigService implements NonScopeAwareService {
4041
private final ProjectionFactory projectionFactory;
4142
private final ConceptRepository conceptRepository;
4243
private final LocationHierarchyService locationHierarchyService;
44+
private final SubjectTypeRepository subjectTypeRepository;
4345
private final ObjectMapper objectMapper;
4446

4547
@Autowired
4648
public OrganisationConfigService(OrganisationConfigRepository organisationConfigRepository,
4749
ProjectionFactory projectionFactory,
4850
ConceptRepository conceptRepository,
49-
@Lazy LocationHierarchyService locationHierarchyService) {
51+
@Lazy LocationHierarchyService locationHierarchyService,
52+
SubjectTypeRepository subjectTypeRepository) {
5053
this.organisationConfigRepository = organisationConfigRepository;
5154
this.projectionFactory = projectionFactory;
5255
this.conceptRepository = conceptRepository;
5356
this.locationHierarchyService = locationHierarchyService;
57+
this.subjectTypeRepository = subjectTypeRepository;
5458
this.objectMapper = ObjectMapperSingleton.getObjectMapper();
5559
}
5660

@@ -118,6 +122,7 @@ public LinkedHashMap<String, Object> getOrganisationSettings(Long organisationId
118122
.collect(Collectors.toList());
119123
organisationSettingsConceptListMap.put("organisationConfig", settings);
120124
organisationSettingsConceptListMap.put("conceptList", conceptList);
125+
organisationSettingsConceptListMap.put("isNewImplementation", subjectTypeRepository.findAllOperational().isEmpty());
121126
return organisationSettingsConceptListMap;
122127
}
123128

0 commit comments

Comments
 (0)