Merge pull request #482 from spidasoftware/downconvert-warning-1520973

resolve wire-mounted equipment downconversion warning [AB#1520973]

Author: jasongarrett

build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'com.spidasoftware.releaseNotes'
 apply plugin: 'org.owasp.dependencycheck'
 
 group = 'com.spidasoftware'
-version = '11.0.1' // If you're changing the major version also change the currentVersion in ConverterUtils.
+version = '11.0.2' // If you're changing the major version also change the currentVersion in ConverterUtils.
 
 def schemaReleaseVersion = System.getenv("SCHEMA_RELEASE_VERSION")
 if(schemaReleaseVersion){

src/main/groovy/com/spidasoftware/schema/conversion/changeset/ConverterUtils.groovy

@@ -103,6 +103,7 @@ class ConverterUtils {
         converter.addChangeSet(11, new MomentAtHeightChangeSet())
         converter.addChangeSet(11, new UpdateTempOverridesChangeSet())
         converter.addChangeSet(11, new WireStateLabelChangeSet())
+        converter.addChangeSet(11, new WireMountedEquipmentChangeSet())
         converter.addChangeSet(11, new TrussChangeSet())
         // add client data changesets above here
 
@@ -121,7 +122,11 @@ class ConverterUtils {
         converter.addChangeSet(10, new LoadCaseChangeSet())
         converter.addChangeSet(10, new LoadCaseNameChangeSet())
         converter.addChangeSet(10, new DecimalDirectionsChangeset())
+        converter.addChangeSet(11, new ClientPoleSettingTypeChangeSet())
         converter.addChangeSet(11, new PoleCutTopChangeSet())
+        converter.addChangeSet(11, new MomentAtHeightChangeSet())
+        converter.addChangeSet(11, new WireStateLabelChangeSet())
+        converter.addChangeSet(11, new WireMountedEquipmentChangeSet())
         converter.addChangeSet(11, new TrussChangeSet())
         // add result changesets above here
 

src/main/groovy/com/spidasoftware/schema/conversion/changeset/v11/WireMountedEquipmentChangeSet.groovy

@@ -4,11 +4,27 @@
 package com.spidasoftware.schema.conversion.changeset.v11
 
 import com.spidasoftware.schema.conversion.changeset.ConversionException
-import com.spidasoftware.schema.conversion.changeset.calc.AbstractCalcDesignChangeset
+import com.spidasoftware.schema.conversion.changeset.client.AbstractClientDataChangeSet
 import groovy.transform.CompileStatic
 
 @CompileStatic
-class WireMountedEquipmentChangeSet extends AbstractCalcDesignChangeset {
+class WireMountedEquipmentChangeSet extends AbstractClientDataChangeSet {
+
+	@Override
+	boolean applyToClientData(Map clientDataJSON) throws ConversionException {
+		// do nothing
+		return false
+	}
+
+	@Override
+	boolean revertClientData(Map clientDataJSON) throws ConversionException {
+		boolean anyChanged = clientDataJSON.remove("wireMountedEquipments") != null
+
+		clientDataJSON.assemblies?.each { Map assembly ->
+			anyChanged |= revertStructure(assembly.assemblyStructure as Map)
+		}
+		return anyChanged
+	}
 
 	@Override
 	void applyToDesign(Map designJSON) throws ConversionException {
@@ -17,7 +33,31 @@ class WireMountedEquipmentChangeSet extends AbstractCalcDesignChangeset {
 
 	@Override
 	void revertDesign(Map designJSON) throws ConversionException {
-		Map structure = designJSON.structure as Map
-		structure?.remove("wireMountedEquipments")
+		super.revertDesign(designJSON)
+
+		if (designJSON.structure != null) {
+			revertStructure(designJSON.structure as Map)
+		}
+	}
+
+	@Override
+	boolean applyToResults(Map resultsJSON) {
+		// do nothing
+		return false
+	}
+
+	@Override
+	boolean revertResults(Map resultsJSON) throws ConversionException {
+		boolean anyChanged = super.revertResults(resultsJSON)
+
+		if (resultsJSON.analyzedStructure != null) {
+			anyChanged |= revertStructure(resultsJSON.analyzedStructure as Map)
+		}
+
+		return anyChanged
+	}
+
+	protected boolean revertStructure(Map structureJSON) {
+		return structureJSON.remove("wireMountedEquipments") != null
 	}
 }

src/test/groovy/com/spidasoftware/schema/conversion/changeset/v11/WireMountedEquipmentChangeSetTest.groovy

@@ -3,6 +3,7 @@
  */
 package com.spidasoftware.schema.conversion.changeset.v11
 
+import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import spock.lang.Specification
 
@@ -27,6 +28,21 @@ class WireMountedEquipmentChangeSetTest extends Specification {
 			!json.leads[0].locations[1].designs[0].structure
 	}
 
+	def "revert a project containing an assembly"() {
+		setup:
+			WireMountedEquipmentChangeSet changeSet = new WireMountedEquipmentChangeSet()
+			def stream = WireMountedEquipmentChangeSetTest.getResourceAsStream("/conversions/v11/project-with-assembly-v11.json")
+			String jsonStr = stream.text
+			stream.close()
+			Map json = (new JsonSlurper()).parseText(jsonStr)
+		expect:
+			jsonStr.contains("wireMountedEquipments")
+		when:
+			changeSet.revertProject(json)
+		then:
+			!JsonOutput.toJson(json).contains("wireMountedEquipments")
+	}
+
 }