Fixed GetByPrimaryKey not having any form to pass primaryKey-data

Set version to 1.4.1

Database-Attribute_System/Attributes/DbAttribute.cs

@@ -16,7 +16,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
         /// <param name="dbAttributeName">Name of database-attribute (case-sensitivity is determined from database-attribute-settings) ['null' if the same as field-name]</param>
         public DbAttribute(string attributeName = null)
         {
-            this._attributeName = attributeName;
+            this._attributeName = attributeName;    // Todo: Automatic resolving of name if it is null (?)
         }
     }
 }

Database-Attribute_System/Attributes/DbForeignKey.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
@@ -10,16 +11,33 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
     {
         public Type _classType;
         public string _attributeName;
+        public string _foreignKeyFieldName;
+        public FieldInfo _foreignKeyField;
 
         /// <summary>
         /// Marks variable as foreignKey of given class
         /// </summary>
         /// <param name="classType">Type of class to which this is the ForeignKey</param>
         /// <param name="dbAttributeName">Name of database-attribute (case-sensitivity is determined from database-attribute-settings) ['null' if the same as field-name]</param>
-        public DbForeignKey(Type classType, string attributeName = null)
+        /// <param name="foreignKeyFieldName">Name of foreignKey-fieldName ['null' if the same as classType-name]</param>
+        public DbForeignKey(Type classType, string foreignKeyFieldName = null, string attributeName = null)
         {
             this._classType = classType;
-            this._attributeName = attributeName;
+            this._attributeName = attributeName;    // Todo: Automatic resolving of name if it is null (?)
+
+            bool fieldFound = false;
+            foreach (System.Reflection.FieldInfo fi in classType.GetRuntimeFields())
+            {
+                if(fi.Name.ToLower() == foreignKeyFieldName.ToLower())
+                {
+                    this._foreignKeyFieldName = fi.Name;
+                    this._foreignKeyField = fi;
+
+                    fieldFound = true;
+                    break;
+                }
+            }
+            if (!fieldFound) throw new InvalidOperationException($"Field with name='{foreignKeyFieldName}' not found in {classType.Name}.");
         }
     }
 }

Database-Attribute_System/Attributes/DbObject.cs

@@ -18,7 +18,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
         /// <param name="tableName">Name of database-table (case-sensitivity is determined from database-table-settings) ['null' if the same as class-name]</param>
         public DbObject(string tableName = null)
         {
-            this._tableName = tableName;
+            this._tableName = tableName;    // Todo: Automatic resolving of name if it is null (?)
         }
     }
 }

Database-Attribute_System/Attributes/DbPrimaryKey.cs

@@ -17,7 +17,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
         /// <param name="dbAttributeName">Name of database-attribute (case-sensitivity is determined from database-attribute-settings) ['null' if the same as field-name]</param>
         public DbPrimaryKey(string attributeName = null)
         {
-            this._attributeName = attributeName;
+            this._attributeName = attributeName;    // Todo: Automatic resolving of name if it is null (?)
         }
     }
 }

Database-Attribute_System/ClassAction.cs

@@ -1,4 +1,5 @@
-using System;
+using eu.railduction.netcore.dll.Database_Attribute_System.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
@@ -22,7 +23,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             string tableName = Function.GetDbTableName(classType);
 
             // Get class-fields
-            Dictionary<string, FieldInfo> dbFields = Function.ReadDbClassFields(classObject);
+            Dictionary<string, FieldInfo> dbFields = Function.ReadDbClassFields(classType);
 
             if (runDataLossChecks)
             {
@@ -72,21 +73,65 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
 
 
         /// <summary>
-        /// Resolves an object with the database<para/>
+        /// Gets an dbObject by primaryKey/s
-        /// Needs to have primaryKey/s-value/s set!<para/>
-        /// - Generates an query<para/>
-        /// - Sends an query via Func<para/>
-        /// - Fills the object with data
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="classObject">Given object (marked with Db-attributes)</param>
         /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
         /// <param name="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</param>
-        public static void ResolveByPrimaryKey<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true)
+        public static T GetByPrimaryKey<T>(Type classType, object primaryKeyValue, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true) where T : new()
         {
-            string query = QueryBuilder.SelectByPrimaryKey(classObject);   // Generate query
+            Dictionary<string, object> primaryKeyData = new Dictionary<string, object>() { };
+            primaryKeyData.Add(null, primaryKeyValue);
+
+            return GetByPrimaryKey<T>(classType, primaryKeyData, queryExecutor, runDataLossChecks);
+        }
+        public static T GetByPrimaryKey<T>(Type classType, string primaryKeyName, object primaryKeyValue, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true) where T : new()
+        {
+            Dictionary<string, object> primaryKeyData = new Dictionary<string, object>() { };
+            primaryKeyData.Add(primaryKeyName, primaryKeyValue);
+
+            return GetByPrimaryKey<T>(classType, primaryKeyData, queryExecutor, runDataLossChecks);
+        }
+        public static T GetByPrimaryKey<T>(Type classType, Dictionary<string, object> primaryKeyData, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true) where T: new()
+        {
+            // Create new empty object
+            T obj = new T();
+
+            // Read all fields
+            Dictionary<string, FieldInfo> dbFields = Function.ReadDbClassFields(classType);
+            // iterate thru them to check and fill object
+            foreach (KeyValuePair<string, FieldInfo> field in dbFields)
+            {
+                // primaryKeys
+                if (field.Value.GetCustomAttribute(typeof(DbPrimaryKey), true) is DbPrimaryKey pkey)
+                {
+                    bool dataMatchFound = false;
+
+                    // Now search the corresponding primaryKeyData
+                    foreach (KeyValuePair<string, object> primaryKey in primaryKeyData)
+                    {
+                        // primaryKey matches
+                        if(field.Value.Name.ToLower() == primaryKey.Key.ToLower())
+                        {
+                            // Set data
+                            field.Value.SetValue(obj, primaryKey.Value);
+
+                            dataMatchFound = true;
+                            break;
+                        }
+                    }
+
+                    // If no data was found matching this field
+                    if (!dataMatchFound) throw new InvalidOperationException($"Cannot create object with primaryKeyData. No data assigned to field '{field.Value.Name}'");
+                }
+            }
+
+            string query = QueryBuilder.SelectByPrimaryKey(obj);   // Generate query
             List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute
-            FillObject(classObject, dataSet[0], runDataLossChecks);   // Fill the object
+            FillObject(obj, dataSet[0], runDataLossChecks);   // Fill the object
+
+            return obj;
         }
 
         /// <summary>
@@ -94,18 +139,17 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="classType">Type of class</param>
-        /// <param name="attributes">attributes for select</param>
+        /// <param name="fields">class-fields for select</param>
         /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
         /// <param name="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</param>
         /// <returns></returns>
-        public static List<T> GetListByAttribute<T>(Type classType, Dictionary<string, object> attributes, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true) where T : new()
+        public static List<T> GetListByAttribute<T>(Type classType, Dictionary<string, object> fields, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true) where T : new()
         {
             string tableName = Function.GetDbTableName(classType);  // Get database-tableName
-            return GetListByAttribute<T>(tableName, attributes, queryExecutor, runDataLossChecks);
+
-        }
+            Function.ConvertAttributeToDbAttributes(classType, fields);
-        public static List<T> GetListByAttribute<T>(string tableName, Dictionary<string, object> attributes, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true) where T: new()
+
-        {
+            string query = QueryBuilder.SelectByAttribute(tableName, fields);   // Generate query
-            string query = QueryBuilder.SelectByAttribute(tableName, attributes);   // Generate query
             List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute
 
             List<T> objs = new List<T>() { };
@@ -118,5 +162,46 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
 
             return objs;    // Return list
         }
+
+
+
+        /// <summary>
+        /// Resolves all foreignKeys with the database<pragma/>
+        /// Only works if the foreignKey is single (not assembled)!
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="classObject">Given object (marked with Db-attributes)</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
+        /// <param name="max_depth">Determents how deep resolving will be executed</param>
+        /// <param name="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</param>
+        public static void ResolveForeignKeys<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, int max_depth = 1, bool runDataLossChecks = true) where T: new()
+        {
+            Type classType = classObject.GetType();
+
+            // Get class-fields
+            Dictionary<string, FieldInfo> dbFields = Function.ReadDbClassFields(classType);
+
+            foreach (KeyValuePair<string, FieldInfo> dbField in dbFields)
+            {
+                // If field is foreignKey
+                if (dbField.Value.GetCustomAttribute(typeof(DbForeignKey), true) is DbForeignKey fkey)
+                {
+                    FieldInfo f_Field = fkey._foreignKeyField;
+                    object f_value = f_Field.GetValue(classObject);
+
+                    // When its empty, get it
+                    if(f_value == null)
+                    {
+                        f_value = GetByPrimaryKey<T>(classType, f_value, queryExecutor, runDataLossChecks); ;
+                    }
+
+                    // Recursive resolving
+                    if (max_depth - 1 > 0)
+                    {
+                        ResolveForeignKeys(f_value, queryExecutor, max_depth - 1, runDataLossChecks);
+                    }
+                }
+            }
+        }
     }
 }

Database-Attribute_System/Database-Attribute_System.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>eu.railduction.netcore.dll.Database_Attribute_System</RootNamespace>
     <SignAssembly>false</SignAssembly>
-    <Version>1.3</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
 </Project>

Database-Attribute_System/internal/Function.cs

@@ -31,6 +31,52 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             }
         }
 
+        internal static void ConvertAttributeToDbAttributes(Type classType, Dictionary<string, object> attributeNameAndValues)
+        {
+            Dictionary<string, FieldInfo> classFields = ReadDbClassFields(classType);
+
+            foreach (KeyValuePair<string, object> attributeNameAndValue in attributeNameAndValues)
+            {
+                bool nameFound = false;
+                foreach (KeyValuePair<string, FieldInfo> classField in classFields)
+                {
+                    if (attributeNameAndValue.Key.ToLower() == classField.Value.Name.ToLower())
+                    {
+                        attributeNameAndValues.Remove(attributeNameAndValue.Key);
+
+                        attributeNameAndValues.Add(classField.Key, attributeNameAndValue.Value);
+
+                        nameFound = true;
+                        break;
+                    }
+                }
+
+                if (!nameFound) throw new InvalidOperationException($"{attributeNameAndValue.Key} has no classField!");
+            }
+        }
+        internal static void ConvertAttributeToDbAttributes(Type classType, List<string> attributeNames)
+        {
+            Dictionary<string, FieldInfo> classFields = ReadDbClassFields(classType);
+
+            List<string> dbAttributes = new List<string>() { };
+            for(int i=0; i< attributeNames.Count; i++)
+            {
+                bool nameFound = false;
+                foreach (KeyValuePair<string, FieldInfo> classField in classFields)
+                {
+                    if(attributeNames[i].ToLower() == classField.Value.Name.ToLower())
+                    {
+                        attributeNames[i] = classField.Key;
+
+                        nameFound = true;
+                        break;
+                    }
+                }
+
+                if (!nameFound) throw new InvalidOperationException($"{attributeNames[i]} has no classField!");
+            }
+        }
+
         internal static void ReadDbClassFields<T>(T classObject, ref Dictionary<string, object> dbPrimaryKeys, ref Dictionary<string, object> dbAttributes, ref Dictionary<string, object> dbForeignKeys)
         {
             Type classType = typeof(T);
@@ -65,10 +111,8 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             }
         }
 
-        internal static Dictionary<string, FieldInfo> ReadDbClassFields<T>(T classObject)
+        internal static Dictionary<string, FieldInfo> ReadDbClassFields(Type classType)
         {
-            Type classType = typeof(T);
-
             Dictionary<string, FieldInfo> dbFields = new Dictionary<string, FieldInfo>();
 
             // Iterate thru all properties