Re-factored DAL Observables using EF Code First !!!!!!

2 files changed, 71 insertions, 26 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index 709da7dda..001a2bb3f 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
 namespace Tango.DAL.Observables
 {
-    [EntityFieldName("@(Model.TableName)")]
-    public partial class @(Model.Name) : ObservableEntity<@(Model.EntityName)>
+    [Table("@(Model.TableName)")]
+    public partial class @(Model.Name) : ObservableEntity
     {
         @foreach (var prop in Model.Fields)
         {
@@ -16,8 +18,9 @@ namespace Tango.DAL.Observables
         /// <summary>
         /// Gets or sets the @(Model.Name.ToLower()) @(prop.Description).
         /// </summary>
-        [EntityFieldName("@(prop.FieldName)")]
-        public @(prop.Type) @(prop.Name)
+        @(!prop.Construct && !prop.Complex ? "[Column(\"" + prop.FieldName + "\")]" : "")
+        @(prop.IsForeignKey ? "[ForeignKey(\"" + prop.ForeignKeyName + "\")]" : "")
+        public @(prop.Construct || prop.Complex ? "virtual" : "") @(prop.Type) @(prop.Name)
         {
             get { return _@(prop.Name.ToLower()); }
             set { _@(prop.Name.ToLower()) = value; RaisePropertyChanged(nameof(@(prop.Name))); }
@@ -30,31 +33,13 @@ namespace Tango.DAL.Observables
         /// </summary>
         public @(Model.Name)() : base()
         {
-            Init();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        public @(Model.Name)(@(Model.EntityName) entity) : base(entity)
-        {
-            Init();
-            MapEntityToObservable(entity, this);
-        }
-
-        /// <summary>
-        /// Initialize complex types.
-        /// </summary>
-        private void Init()
-        {
             @foreach (var prop in Model.Fields)
             {
                 if (prop.Construct)
-                { 
-                <div>
-                    @(prop.Name) = new @(prop.Type)();
-                </div>
+                {
+                    <div>
+                        @(prop.Name) = new @(prop.Type)();
+                    </div>
                 }
             }
         }
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
new file mode 100644
index 000000000..43330235c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Settings;
+
+namespace Tango.DAL.Observables
+{
+    public class ObservablesContext : DbContext
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObservablesContext" /> class.
+        /// </summary>
+        /// <param name="path">The server file path.</param>
+        /// <param name="isFile">if set to <c>true</c> will try to connect to an .mdf file.</param>
+        public ObservablesContext(String path, bool isFile) : base(ComposeConnectionString(path, isFile))
+        {
+
+        }
+
+        /// <summary>
+        /// Composes the connection string.
+        ///</summary>
+        /// <param name="source">The source.</param>
+        /// <param name="isFile">if set to <c>true</c> [is file].</param>
+        /// <returns></returns>
+        private static String ComposeConnectionString(String source, bool isFile)
+        {
+            if (!isFile)
+            {
+                return String.Format("Data Source={0};Initial Catalog=Tango;Integrated Security=true", source);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a default remote database context by the address specified in <see cref="SettingsManager.Default.DataBase.SQLServerAddress" />.
+        /// </summary>
+        /// <returns></returns>
+        public static ObservablesContext CreateDefault()
+        {
+            return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false);
+        }
+
+        @foreach (var prop in Model.Properties)
+        {
+            <div>
+                /// <summary>
+                /// Gets or sets the @(prop.Name).
+                /// </summary>
+                public @(prop.Type) @(prop.Name) { get; set; }
+            </div>
+        }
+    }
+}