Merge pull request #1265 from Crown-Commercial-Service/bugfix/CAS-897…

…_Update_time_lines Copying the timelinedependency
Crown-Commercial-Service · Jun 13, 2023 · 41e8ef5 · 41e8ef5
2 parents a6b1000 + b69d115
commit 41e8ef5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 23 deletions.
diff --git a/...ava/uk/gov/crowncommercial/dts/scale/cat/processors/inheritance/InheritanceProcessor.java b/...ava/uk/gov/crowncommercial/dts/scale/cat/processors/inheritance/InheritanceProcessor.java
@@ -2,6 +2,7 @@
 
 import uk.gov.crowncommercial.dts.scale.cat.model.agreements.Requirement;
 import uk.gov.crowncommercial.dts.scale.cat.model.agreements.RequirementGroup;
+import uk.gov.crowncommercial.dts.scale.cat.model.generated.DataTemplateInheritanceType;
 
 import java.util.Map;
 
@@ -16,4 +17,23 @@ default Requirement getQuestion(RequirementGroup requirementGroup, Requirement r
         }
         return null;
     }
+
+    default  void copyOptions(Requirement req, Requirement question) {
+        if(null != question.getNonOCDS().getOptions())
+            req.getNonOCDS().updateOptions(question.getNonOCDS().getOptions());
+        if(null != question.getNonOCDS().getTimelineDependency())
+            req.getNonOCDS().setTimelineDependency(question.getNonOCDS().getTimelineDependency());
+    }
+
+    default void processRequirments(RequirementGroup requirementGroup, Map<String, Requirement> questions, DataTemplateInheritanceType inheritance) {
+        for(Requirement req : requirementGroup.getOcds().getRequirements()) {
+            Requirement question = getQuestion(requirementGroup, req, questions);
+            if(null != question) {
+                req.getNonOCDS().setInheritance(inheritance);
+                copyOptions(req, question);
+            }else{
+                req.getNonOCDS().setInheritance(null);
+            }
+        }
+    }
 }
diff --git a/...v/crowncommercial/dts/scale/cat/processors/inheritance/RequirementGroupAsIsProcessor.java b/...v/crowncommercial/dts/scale/cat/processors/inheritance/RequirementGroupAsIsProcessor.java
@@ -2,6 +2,7 @@
 
 import uk.gov.crowncommercial.dts.scale.cat.model.agreements.Requirement;
 import uk.gov.crowncommercial.dts.scale.cat.model.agreements.RequirementGroup;
+import uk.gov.crowncommercial.dts.scale.cat.model.generated.DataTemplateInheritanceType;
 
 
 import java.util.Map;
@@ -11,15 +12,10 @@
 public class RequirementGroupAsIsProcessor implements InheritanceProcessor<RequirementGroup> {
     @Override
     public void accept(RequirementGroup requirementGroup, Map<String, Requirement> questions) {
-        for(Requirement req : requirementGroup.getOcds().getRequirements()) {
-            Requirement question = getQuestion(requirementGroup, req, questions);
-            if(null != question) {
-                req.getNonOCDS().setInheritance(ASIS);
-                if(null != question.getNonOCDS().getOptions())
-                    req.getNonOCDS().updateOptions(question.getNonOCDS().getOptions());
-            }else{
-                req.getNonOCDS().setInheritance(null);
-            }
-        }
+        processRequirments(requirementGroup, questions,ASIS);
     }
+
+
+
+
 }
diff --git a/...v/crowncommercial/dts/scale/cat/processors/inheritance/RequirementGroupEditProcessor.java b/...v/crowncommercial/dts/scale/cat/processors/inheritance/RequirementGroupEditProcessor.java
@@ -5,21 +5,12 @@
 
 import java.util.Map;
 
+import static uk.gov.crowncommercial.dts.scale.cat.model.generated.DataTemplateInheritanceType.ASIS;
 import static uk.gov.crowncommercial.dts.scale.cat.model.generated.DataTemplateInheritanceType.EDIT;
 
 public class RequirementGroupEditProcessor implements InheritanceProcessor<RequirementGroup> {
     @Override
     public void accept(RequirementGroup requirementGroup, Map<String, Requirement> questions) {
-        for (Requirement req : requirementGroup.getOcds().getRequirements()) {
-            Requirement question = getQuestion(requirementGroup, req, questions);
-            if (null != question) {
-                req.getNonOCDS().setInheritance(EDIT);
-                if(null != question.getNonOCDS().getOptions())
-                    req.getNonOCDS().updateOptions(question.getNonOCDS().getOptions());
-            } else {
-                req.getNonOCDS().setInheritance(null);
-            }
-
-        }
+        processRequirments(requirementGroup, questions,EDIT);
     }
 }
diff --git a/...v/crowncommercial/dts/scale/cat/processors/inheritance/RequirementGroupPartProcessor.java b/...v/crowncommercial/dts/scale/cat/processors/inheritance/RequirementGroupPartProcessor.java
@@ -25,8 +25,7 @@ public void accept(RequirementGroup requirementGroup, Map<String, Requirement> q
                     Requirement question = getQuestion(requirementGroup, req, questions);
                     if(null != question) {
                         req.getNonOCDS().setInheritance(inheritanceType);
-                        if(null != question.getNonOCDS().getOptions())
-                            req.getNonOCDS().updateOptions(question.getNonOCDS().getOptions());
+                        copyOptions(req, question);
                     }else{
                         req.getNonOCDS().setInheritance(null);
                     }