SHIBUI-645: handle default position order when persisting new metadat…

…a resolvers
TIER · Jul 27, 2018 · a55b424 · a55b424
1 parent bbbf4ca
commit a55b424
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
@@ -104,6 +104,7 @@ public ResponseEntity<?> create(@RequestBody MetadataResolver newResolver) {
 
         newResolver.convertFiltersFromTransientRepresentationIfNecessary();
         MetadataResolver persistedResolver = resolverRepository.save(newResolver);
+        positionOrderContainerService.appendPositionOrderForNew(persistedResolver);
         persistedResolver.updateVersion();
 
         persistedResolver.convertFiltersIntoTransientRepresentationIfNecessary();

diff --git a/...er/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/...er/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -62,6 +62,14 @@ public MetadataResolversPositionOrderContainer retrieveExistingOrEmpty() {
         return getPositionOrderContainerIfExists().orElseGet(MetadataResolversPositionOrderContainer::new);
     }
 
+    @Override
+    @Transactional
+    public void appendPositionOrderForNew(MetadataResolver metadataResolver) {
+        MetadataResolversPositionOrderContainer positionOrderContainer = retrieveExistingOrEmpty();
+        positionOrderContainer.getResourceIds().add(metadataResolver.getResourceId());
+        positionOrderContainerRepository.save(positionOrderContainer);
+    }
+
     private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
         Iterator<MetadataResolversPositionOrderContainer> iter = positionOrderContainerRepository.findAll().iterator();
         return iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();

diff --git a/...net2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/...net2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -18,4 +18,6 @@ public interface MetadataResolversPositionOrderContainerService {
     void addOrUpdatePositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
 
     List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered();
+
+    void appendPositionOrderForNew(MetadataResolver metadataResolver);
 }