AXRepository - gestione campi rubrica su profilo

il-katta · Aug 2, 2022 · 52508a5 · 52508a5
1 parent d443d0c
commit 52508a5
Show file tree

Hide file tree

Showing 9 changed files with 183 additions and 78 deletions.
diff --git a/ACUtils.AXRepository/ACUtils.AXRepository.csproj b/ACUtils.AXRepository/ACUtils.AXRepository.csproj
@@ -5,8 +5,8 @@
     <Authors>Andrea Cattaneo</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>1.0.0.141</Version>
-    <PackageVersion>1.0.0.141</PackageVersion>
+    <Version>1.0.0.142</Version>
+    <PackageVersion>1.0.0.142</PackageVersion>
     <Description>Utility per gestione classi documentali Arxivar</Description>
     <NeutralLanguage>it</NeutralLanguage>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/ACUtils.AXRepository/AXModel.cs b/ACUtils.AXRepository/AXModel.cs
@@ -28,7 +28,7 @@ public virtual string STATO
         [AxField(ax_field: "From")]
         public virtual string User { get; set; }
 
-        [AxField(ax_field: "From_ExternalId")]
+        [AxFromExternalIdField]
         public virtual string MittenteCodiceRubrica { get; set; }
 
         [AxField(ax_field: "From")]
@@ -37,7 +37,7 @@ public virtual string STATO
         //[AxField(ax_field: "From_IdRubrica")]
         public virtual int? MittenteIdRubrica { get; set; }
 
-        [AxField(ax_field: "To_ExternalId")]
+        [AxToExternalIdField]
         public virtual IEnumerable<string> DestinatariCodiceRubrica { get; set; }
 
         [AxField(ax_field: "To")]
@@ -159,14 +159,14 @@ public static T Idrate(ArxivarNext.Model.EditProfileSchemaDTO model)
                     obj.SetPropertyIfExists(field.Name, dfiled.Value);
                 }
             }
-            
+
             obj.SetPropertyIfExists("DOCNUMBER", model.ProfileInfo.DocNumber);
-            
+
             var mittente = model.Fields.GetField<ArxivarNext.Model.ToFieldDTO>("TO");
-            obj.SetPropertyIfExists("To_ExternalId", mittente.Value?.Select(m => m.ExternalId));
-            
+            obj.SetPropertyIfExists(AxToExternalIdFieldAttribute.AX_KEY, mittente.Value?.Select(m => m.ExternalId));
+
             var destinatario = model.Fields.GetField<ArxivarNext.Model.FromFieldDTO>("FROM");
-            obj.SetPropertyIfExists("From_ExternalId", destinatario.Value?.ExternalId);
+            obj.SetPropertyIfExists(AxFromExternalIdFieldAttribute.AX_KEY, destinatario.Value?.ExternalId);
             return obj;
         }
 
@@ -210,9 +210,9 @@ public static List<T> Idrate(List<ArxivarNext.Model.RowSearchResult> results)
             return (from result in results select Idrate(result)).ToList();
         }
 
-#endregion
+        #endregion
 
-#region testers
+        #region testers
         public new bool HasDbField(string field)
         {
             return this.GetType().GetProperties().Where(property =>
@@ -224,9 +224,9 @@ public bool HasAXField(string field)
         {
             return this.GetType().GetProperties().Where(property => GetArxivarAttribute(property.Name)?.AXField == field).Any();
         }
-#endregion
+        #endregion
 
-#region getters
+        #region getters
 
         public AxClassAttribute GetArxivarAttribute()
         {
@@ -298,7 +298,8 @@ public Dictionary<string, object> GetArxivarFields()
                 var ax = GetArxivarAttribute(property.Name);
                 if (ax != null && !string.IsNullOrEmpty(ax.AXField))
                 {
-                    fields.Add(ax.AXField, this[ax.AXField]);
+                    if (!fields.Keys.Contains(ax.AXField))
+                        fields.Add(ax.AXField, this[ax.AXField]);
                 }
             }
             return fields;
@@ -343,6 +344,6 @@ public Dictionary<string, object> GetPrimaryKeys()
             return fields;
         }
 
-#endregion
+        #endregion
     }
 }