MODSER-42: Separate out chronology and enumeration (#127)

* refactor: Initial domain model work

Initial domain model work seperating out TemplateMetadataRules into chronology and enumeration arrays, removing parent classes assigning these based on refdata

WIP

* refactor: Further seperatation

Additionally seperated out enumeration and chronology templateMetadataRuleFormats, is building but ALOT more testing needs to be done

WIP

* feat: Initial migrations

Added initial migrations for handling domain class changes and renaming of new fields

WIP

* refactor: Views updated

Updated views to new domain models

* refactor: Updated chronology/enumeration rules naming

Within the templateConfig, updated chronology/enumeration to be chronologyRules/enumerationRules

* refactor: Updated services and domain model methods

Updated methods within services and domain models to match the new domain models

Are we finally in a posistion that this works? I hope so

* fix: Initial old data migrations work

* feat: Even more initial migrations

* feat: Template metadata rule migration

* fix: Migrations testing

* fix: Another fix attempt

* fix: Another migration fix

Hopefully this works

* fix: Set fix

* fix: Another variable fix

* fix: Review version of migrations

* fix: Template metadataruleformat migration

* fix: Missing changes from last commit

* fix: Removed uneeded variables

* fix: incorrect variable name

* fix: Pure sql changes

* fix: Sql dump fix

Jesus christ this is alot of commits

* fix: Potentail final migration version

* fix: Final migrations version

* fix: Uctm iterators fix

Added another iterator for enumeration rules as this was cuasing issues

* fix: Stupid database naming mistake

* fix: Enumeration starting value index

Added filter functions to seperate out chronology/enumeration UCTM so indexing will work with newly seperated TMR

service/grails-app/domain/org/olf/templateConfig/TemplateConfig.groovy

@@ -1,6 +1,8 @@
 package org.olf.templateConfig
 
-import org.olf.templateConfig.templateMetadataRule.TemplateMetadataRule
+import org.olf.templateConfig.templateMetadataRule.ChronologyTemplateMetadataRule
+import org.olf.templateConfig.templateMetadataRule.EnumerationTemplateMetadataRule
+
 import org.olf.SerialRuleset
 
 import grails.gorm.MultiTenant
@@ -13,10 +15,10 @@ public class TemplateConfig implements MultiTenant<TemplateConfig> {
   String id
   SerialRuleset owner
   String templateString
-  // TODO Maybe seprate into two seperate lists for enumeration and chronology
 
   static hasMany = [
-    rules: TemplateMetadataRule
+    chronologyRules: ChronologyTemplateMetadataRule,
+    enumerationRules: EnumerationTemplateMetadataRule
   ]
 
   static belongsTo = [
@@ -28,12 +30,14 @@ public class TemplateConfig implements MultiTenant<TemplateConfig> {
     owner column: 'tc_owner_fk'
     version column: 'tc_version'
     templateString column: 'tc_template_string'
-    rules cascade: 'all-delete-orphan', sort: 'index', order: 'asc'
+    chronologyRules cascade: 'all-delete-orphan', sort: 'index', order: 'asc'
+    enumerationRules cascade: 'all-delete-orphan', sort: 'index', order: 'asc'
   }
 
   static constraints = {
     owner nullable: false
-    rules nullable: true
+    chronologyRules nullable: true
+    enumerationRules nullable: true
     templateString nullable: false
   }
 }

service/grails-app/domain/org/olf/templateConfig/templateMetadataRule/ChronologyTemplateMetadataRule.groovy

@@ -1,6 +1,7 @@
 package org.olf.templateConfig.templateMetadataRule
 
-import org.olf.templateConfig.templateMetadataRuleFormat.TemplateMetadataRuleFormat
+import org.olf.templateConfig.TemplateConfig
+import org.olf.templateConfig.templateMetadataRuleFormat.ChronologyTemplateMetadataRuleFormat
 import org.olf.internalPiece.templateMetadata.ChronologyUCTMT
 
 import java.util.regex.Pattern
@@ -16,7 +17,10 @@ import com.k_int.web.toolkit.refdata.CategoryId
 import com.k_int.web.toolkit.refdata.Defaults
 import com.k_int.web.toolkit.refdata.RefdataValue
 
-public class ChronologyTemplateMetadataRule extends TemplateMetadataRuleType implements MultiTenant<ChronologyTemplateMetadataRule> {
+public class ChronologyTemplateMetadataRule implements MultiTenant<ChronologyTemplateMetadataRule> {
+  String id
+  TemplateConfig owner
+  Integer index
 
   @CategoryId(value="ChronologyTemplateMetadataRule.TemplateMetadataRuleFormat", defaultInternal=true)
   // We setup these defaults within the HouseKeepingService in order to assign non-standard labels
@@ -25,32 +29,38 @@ public class ChronologyTemplateMetadataRule extends TemplateMetadataRuleType imp
 
   String ruleLocale = 'en'
 
-  @BindUsing({ TemplateMetadataRuleType obj, SimpleMapDataBindingSource source ->
-		TemplateMetadataRuleTypeHelpers.doRuleFormatBinding(obj, source)
+  @BindUsing({ ChronologyTemplateMetadataRule obj, SimpleMapDataBindingSource source ->
+		ChronologyTemplateMetadataRuleHelpers.doRuleFormatBinding(obj, source)
   })
-  TemplateMetadataRuleFormat ruleFormat
+  ChronologyTemplateMetadataRuleFormat ruleFormat
 
   static hasOne = [
-   	ruleFormat: TemplateMetadataRuleFormat
+   	ruleFormat: ChronologyTemplateMetadataRuleFormat
   ]
 
 
   static mapping = {
+    id column: 'ctmr_id', generator: 'uuid2', length: 36
+    owner column: 'ctmr_owner_fk'
+    index column: 'ctmr_index'
+    version column: 'ctmr_version'
     templateMetadataRuleFormat column: 'ctmr_template_metadata_rule_format_fk'
     ruleLocale column: 'ctmr_rule_locale'
     ruleFormat cascade: 'all-delete-orphan'
   }
 
   static constraints = {
+    owner nullable: false
+    index nullable: false
     templateMetadataRuleFormat nullable: false
     ruleLocale nullable: false
-    ruleFormat nullable: false, validator: TemplateMetadataRuleTypeHelpers.ruleFormatValidator
+    ruleFormat nullable: false, validator: ChronologyTemplateMetadataRuleHelpers.ruleFormatValidator
   }
 
-  public static ChronologyUCTMT handleType(TemplateMetadataRule rule, LocalDate date, int index) {
+  public static ChronologyUCTMT handleType(ChronologyTemplateMetadataRule rule, LocalDate date, int index) {
     final Pattern RGX_RULE_FORMAT = Pattern.compile('_([a-z])')
-    String ruleFormatClassString = RGX_RULE_FORMAT.matcher(rule?.ruleType?.templateMetadataRuleFormat?.value).replaceAll { match -> match.group(1).toUpperCase() }
-    Class<? extends TemplateMetadataRuleFormat> rfc = Class.forName("org.olf.templateConfig.templateMetadataRuleFormat.${ruleFormatClassString.capitalize()}TMRF")
+    String ruleFormatClassString = RGX_RULE_FORMAT.matcher(rule?.templateMetadataRuleFormat?.value).replaceAll { match -> match.group(1).toUpperCase() }
+    Class<? extends ChronologyTemplateMetadataRuleFormat> rfc = Class.forName("org.olf.templateConfig.templateMetadataRuleFormat.${ruleFormatClassString.capitalize()}TMRF")
     return rfc.handleFormat(rule, date, index)
   }
 }

service/grails-app/domain/org/olf/templateConfig/templateMetadataRule/EnumerationTemplateMetadataRule.groovy

@@ -1,6 +1,7 @@
 package org.olf.templateConfig.templateMetadataRule
 
-import org.olf.templateConfig.templateMetadataRuleFormat.TemplateMetadataRuleFormat
+import org.olf.templateConfig.TemplateConfig
+import org.olf.templateConfig.templateMetadataRuleFormat.EnumerationTemplateMetadataRuleFormat
 import org.olf.internalPiece.templateMetadata.EnumerationUCTMT
 
 import java.util.regex.Pattern
@@ -15,35 +16,45 @@ import com.k_int.web.toolkit.refdata.CategoryId
 import com.k_int.web.toolkit.refdata.Defaults
 import com.k_int.web.toolkit.refdata.RefdataValue
 
-public class EnumerationTemplateMetadataRule extends TemplateMetadataRuleType implements MultiTenant<EnumerationTemplateMetadataRule> {
+public class EnumerationTemplateMetadataRule implements MultiTenant<EnumerationTemplateMetadataRule> {
+  String id
+  TemplateConfig owner
+  Integer index
+
   @CategoryId(value="EnumerationTemplateMetadataRule.TemplateMetadataRuleFormat", defaultInternal=true)
   // We setup these defaults within the HouseKeepingService in order to assign non-standard labels
   // @Defaults(['Enumeration Numeric', 'Enumeration Textual'])
   RefdataValue templateMetadataRuleFormat
 
-  @BindUsing({ TemplateMetadataRuleType obj, SimpleMapDataBindingSource source ->
-		TemplateMetadataRuleTypeHelpers.doRuleFormatBinding(obj, source)
+  @BindUsing({ EnumerationTemplateMetadataRule obj, SimpleMapDataBindingSource source ->
+		EnumerationTemplateMetadataRuleHelpers.doRuleFormatBinding(obj, source)
   })
-  TemplateMetadataRuleFormat ruleFormat
+  EnumerationTemplateMetadataRuleFormat ruleFormat
 
   static hasOne = [
-   	ruleFormat: TemplateMetadataRuleFormat
+   	ruleFormat: EnumerationTemplateMetadataRuleFormat
   ]
 
   static mapping = {
+    id column: 'etmr_id', generator: 'uuid2', length: 36
+    owner column: 'etmr_owner_fk'
+    index column: 'etmr_index'
+    version column: 'etmr_version'
     templateMetadataRuleFormat column: 'etmr_template_metadata_rule_format_fk'
     ruleFormat cascade: 'all-delete-orphan'
   }
 
   static constraints = {
+    owner nullable: false
+    index nullable: false
     templateMetadataRuleFormat nullable: false
-    ruleFormat nullable: false, validator: TemplateMetadataRuleTypeHelpers.ruleFormatValidator
+    ruleFormat nullable: false, validator: EnumerationTemplateMetadataRuleHelpers.ruleFormatValidator
   }
 
-  public static EnumerationUCTMT handleType(TemplateMetadataRule rule, LocalDate date, int index, EnumerationUCTMT startingValues) {
+  public static EnumerationUCTMT handleType(EnumerationTemplateMetadataRule rule, LocalDate date, int index, EnumerationUCTMT startingValues) {
     final Pattern RGX_RULE_FORMAT = Pattern.compile('_([a-z])')
-    String ruleFormatClassString = RGX_RULE_FORMAT.matcher(rule?.ruleType?.templateMetadataRuleFormat?.value).replaceAll { match -> match.group(1).toUpperCase() }
-    Class<? extends TemplateMetadataRuleFormat> rfc = Class.forName("org.olf.templateConfig.templateMetadataRuleFormat.${ruleFormatClassString.capitalize()}TMRF")
+    String ruleFormatClassString = RGX_RULE_FORMAT.matcher(rule?.templateMetadataRuleFormat?.value).replaceAll { match -> match.group(1).toUpperCase() }
+    Class<? extends EnumerationTemplateMetadataRuleFormat> rfc = Class.forName("org.olf.templateConfig.templateMetadataRuleFormat.${ruleFormatClassString.capitalize()}TMRF")
     return rfc.handleFormat(rule, date, index, startingValues)
   }
 }

service/grails-app/domain/org/olf/templateConfig/templateMetadataRuleFormat/ChronologyDateTMRF.groovy

@@ -2,7 +2,7 @@ package org.olf.templateConfig.templateMetadataRuleFormat
 
 import grails.gorm.MultiTenant
 
-import org.olf.templateConfig.templateMetadataRule.TemplateMetadataRule
+import org.olf.templateConfig.templateMetadataRule.ChronologyTemplateMetadataRule
 import org.olf.internalPiece.templateMetadata.ChronologyUCTMT
 
 import java.time.LocalDate
@@ -14,7 +14,7 @@ import com.k_int.web.toolkit.refdata.CategoryId
 import com.k_int.web.toolkit.refdata.Defaults
 import com.k_int.web.toolkit.refdata.RefdataValue
 
-public class ChronologyDateTMRF extends TemplateMetadataRuleFormat implements MultiTenant<ChronologyDateTMRF> {
+public class ChronologyDateTMRF extends ChronologyTemplateMetadataRuleFormat implements MultiTenant<ChronologyDateTMRF> {
 
   @CategoryId(value="Global.WeekdayFormat", defaultInternal=true)
   @Defaults(['Slice Lower', 'Slice Upper', 'Full Lower', 'Full Upper'])
@@ -76,9 +76,9 @@ public class ChronologyDateTMRF extends TemplateMetadataRuleFormat implements Mu
       full_lower: 'EEEE',
 		]
 
-  public static ChronologyUCTMT handleFormat(TemplateMetadataRule rule, LocalDate date, int index) {
-    Locale locale = new Locale(rule?.ruleType?.ruleLocale)
-    ChronologyDateTMRF tmrf = rule?.ruleType?.ruleFormat
+  public static ChronologyUCTMT handleFormat(ChronologyTemplateMetadataRule rule, LocalDate date, int index) {
+    Locale locale = new Locale(rule?.ruleLocale)
+    ChronologyDateTMRF tmrf = rule?.ruleFormat
     // TODO Dont handle if not a chronology rule
 		String weekday = date.format(DateTimeFormatter.ofPattern(weekdayFormatTransform.get(tmrf?.weekdayFormat?.value), locale))
 		if(tmrf?.weekdayFormat?.value.endsWith('upper')){

service/grails-app/domain/org/olf/templateConfig/templateMetadataRuleFormat/ChronologyMonthTMRF.groovy

@@ -1,6 +1,6 @@
 package org.olf.templateConfig.templateMetadataRuleFormat
 
-import org.olf.templateConfig.templateMetadataRule.TemplateMetadataRule
+import org.olf.templateConfig.templateMetadataRule.ChronologyTemplateMetadataRule
 import org.olf.internalPiece.templateMetadata.ChronologyUCTMT
 
 import grails.gorm.MultiTenant
@@ -14,7 +14,7 @@ import com.k_int.web.toolkit.refdata.CategoryId
 import com.k_int.web.toolkit.refdata.Defaults
 import com.k_int.web.toolkit.refdata.RefdataValue
 
-public class ChronologyMonthTMRF extends TemplateMetadataRuleFormat implements MultiTenant<ChronologyMonthTMRF> {
+public class ChronologyMonthTMRF extends ChronologyTemplateMetadataRuleFormat implements MultiTenant<ChronologyMonthTMRF> {
 
   @CategoryId(value="Global.MonthFormat", defaultInternal=true)
   @Defaults(['Full', 'Slice', 'Number'])
@@ -34,9 +34,9 @@ public class ChronologyMonthTMRF extends TemplateMetadataRuleFormat implements M
     yearFormat nullable: false
   }
 
-  public static ChronologyUCTMT handleFormat(TemplateMetadataRule rule, LocalDate date, int index) {
-    Locale locale = new Locale(rule?.ruleType?.ruleLocale)
-    ChronologyMonthTMRF tmrf = rule?.ruleType?.ruleFormat
+  public static ChronologyUCTMT handleFormat(ChronologyTemplateMetadataRule rule, LocalDate date, int index) {
+    Locale locale = new Locale(rule?.ruleLocale)
+    ChronologyMonthTMRF tmrf = rule?.ruleFormat
     Map<String, String> getYearFormat = [
     	slice: 'yy',
      	full: 'yyyy',

service/grails-app/domain/org/olf/templateConfig/templateMetadataRuleFormat/ChronologyTemplateMetadataRuleFormat.groovy

@@ -0,0 +1,22 @@
+package org.olf.templateConfig.templateMetadataRuleFormat
+
+import org.olf.templateConfig.templateMetadataRule.ChronologyTemplateMetadataRule
+
+import grails.gorm.MultiTenant
+
+public abstract class ChronologyTemplateMetadataRuleFormat implements MultiTenant<ChronologyTemplateMetadataRuleFormat> {
+  String id
+  ChronologyTemplateMetadataRule owner
+
+  static mapping = {
+    id column: 'ctmrf_id', generator: 'uuid2', length: 36
+    owner column: 'ctmrf_owner_fk'
+    version column: 'ctmrf_version'
+
+    tablePerHierarchy false
+  }
+
+  static constraints = {
+    owner nullable: false
+  }
+}

service/grails-app/domain/org/olf/templateConfig/templateMetadataRuleFormat/ChronologyYearTMRF.groovy

@@ -2,7 +2,7 @@ package org.olf.templateConfig.templateMetadataRuleFormat
 
 import grails.gorm.MultiTenant
 
-import org.olf.templateConfig.templateMetadataRule.TemplateMetadataRule
+import org.olf.templateConfig.templateMetadataRule.ChronologyTemplateMetadataRule
 import org.olf.internalPiece.templateMetadata.ChronologyUCTMT
 
 import java.time.LocalDate
@@ -12,7 +12,7 @@ import com.k_int.web.toolkit.refdata.CategoryId
 import com.k_int.web.toolkit.refdata.Defaults
 import com.k_int.web.toolkit.refdata.RefdataValue
 
-public class ChronologyYearTMRF extends TemplateMetadataRuleFormat implements MultiTenant<ChronologyYearTMRF> {
+public class ChronologyYearTMRF extends ChronologyTemplateMetadataRuleFormat implements MultiTenant<ChronologyYearTMRF> {
 
   @CategoryId(value="Global.YearFormat", defaultInternal=true)
   @Defaults(['Full', 'Slice'])
@@ -26,9 +26,9 @@ public class ChronologyYearTMRF extends TemplateMetadataRuleFormat implements Mu
     yearFormat nullable: false
   }
 
-  public static ChronologyUCTMT handleFormat(TemplateMetadataRule rule, LocalDate date, int index) {
-    Locale locale = new Locale(rule?.ruleType?.ruleLocale)
-		ChronologyYearTMRF tmrf = rule?.ruleType?.ruleFormat
+  public static ChronologyUCTMT handleFormat(ChronologyTemplateMetadataRule rule, LocalDate date, int index) {
+    Locale locale = new Locale(rule?.ruleLocale)
+		ChronologyYearTMRF tmrf = rule?.ruleFormat
     Map<String, String> getYearFormat = [
     	slice: 'yy',
      	full: 'yyyy',

service/grails-app/domain/org/olf/templateConfig/templateMetadataRuleFormat/EnumerationNumericTMRF.groovy

@@ -1,6 +1,6 @@
 package org.olf.templateConfig.templateMetadataRuleFormat
 
-import org.olf.templateConfig.templateMetadataRule.TemplateMetadataRule
+import org.olf.templateConfig.templateMetadataRule.EnumerationTemplateMetadataRule
 import org.olf.internalPiece.templateMetadata.EnumerationUCTMT
 import org.olf.internalPiece.templateMetadata.EnumerationLevelUCTMT
 
@@ -14,7 +14,7 @@ import com.k_int.web.toolkit.refdata.RefdataValue
 
 import com.github.fracpete.romannumerals4j.RomanNumeralFormat;
 
-public class EnumerationNumericTMRF extends TemplateMetadataRuleFormat implements MultiTenant<EnumerationNumericTMRF> {
+public class EnumerationNumericTMRF extends EnumerationTemplateMetadataRuleFormat implements MultiTenant<EnumerationNumericTMRF> {
   Set<EnumerationNumericLevelTMRF> levels
 
   static hasMany = [
@@ -41,11 +41,11 @@ public class EnumerationNumericTMRF extends TemplateMetadataRuleFormat implement
     }
 	}
 
-  public static EnumerationUCTMT handleFormat (TemplateMetadataRule rule, LocalDate date, int index, EnumerationUCTMT startingValues){
+  public static EnumerationUCTMT handleFormat (EnumerationTemplateMetadataRule rule, LocalDate date, int index, EnumerationUCTMT startingValues){
     RomanNumeralFormat rnf = new RomanNumeralFormat();
 
     // Array of EnumerationNumericLevels sorted by index
-    ArrayList<EnumerationNumericLevelTMRF> enltmrfArray = rule?.ruleType?.ruleFormat?.levels?.sort { it?.index }
+    ArrayList<EnumerationNumericLevelTMRF> enltmrfArray = rule?.ruleFormat?.levels?.sort { it?.index }
     // Array of starting values sorted by index
     ArrayList<EnumerationLevelUCTMT> levelStartingValueArray = startingValues?.levels?.sort { it?.index }
     ArrayList<EnumerationLevelUCTMT> result = []