Refactored test to procedures.

5 files changed, 64 insertions, 64 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedProcedureProject.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedProcedureProject.cs
new file mode 100644
index 000000000..34d691e2c
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedProcedureProject.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.ActionLogs;
+using Tango.BL.DTO;
+
+namespace Tango.FSE.BL.CacheEntities
+{
+    public class CachedPublishedProcedureProject : PublishedProcedureProjectDTO
+    {
+        [ActionLogIgnore]
+        public List<PublishedProcedureProjectsVersionDTO> PublishedProcedureProjectsVersions { get; set; }
+
+        public CachedPublishedProcedureProject()
+        {
+            PublishedProcedureProjectsVersions = new List<PublishedProcedureProjectsVersionDTO>();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedTestProject.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedTestProject.cs
deleted file mode 100644
index 622df70c7..000000000
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedTestProject.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.ActionLogs;
-using Tango.BL.DTO;
-
-namespace Tango.FSE.BL.CacheEntities
-{
-    public class CachedPublishedTestProject : PublishedTestProjectDTO
-    {
-        [ActionLogIgnore]
-        public List<PublishedTestProjectsVersionDTO> PublishedTestProjectsVersions { get; set; }
-
-        public CachedPublishedTestProject()
-        {
-            PublishedTestProjectsVersions = new List<PublishedTestProjectsVersionDTO>();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs
index eaa29bfdb..e5487bc1e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs
@@ -48,9 +48,9 @@ namespace Tango.FSE.BL
         public TechComponentsService TechComponentsService { get; set; }
 
         /// <summary>
-        /// Gets or sets the published test projects service.
+        /// Gets or sets the published procedure projects service.
         /// </summary>
-        public PublishedTestProjectsService PublishedTestProjectsService { get; set; }
+        public PublishedProcedureProjectsService PublishedProcedureProjectsService { get; set; }
 
         /// <summary>
         /// Gets or sets the machine events service.
@@ -75,7 +75,7 @@ namespace Tango.FSE.BL
             BugReportingService = new BugReportingService();
             TangoVersionsService = new TangoVersionsService();
             TechComponentsService = new TechComponentsService();
-            PublishedTestProjectsService = new PublishedTestProjectsService();
+            PublishedProcedureProjectsService = new PublishedProcedureProjectsService();
             MachineEventsService = new MachineEventsService();
             OrganizationsService = new OrganizationsService();
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedTestProjectsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedProcedureProjectsService.cs
index d95899e23..074483dec 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedTestProjectsService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedProcedureProjectsService.cs
@@ -12,20 +12,20 @@ using Z.EntityFramework.Plus;
 
 namespace Tango.FSE.BL.Services
 {
-    public class PublishedTestProjectsService : FSEServiceBase
+    public class PublishedProcedureProjectsService : FSEServiceBase
     {
-        private const string PUBLISHED_TEST_PROJECTS_COLLECTION = "PublishedTestProjects";
+        private const string PUBLISHED_Procedure_PROJECTS_COLLECTION = "PublishedProcedureProjects";
 
-        private MemoryCacheDictionary<String, CachedPublishedTestProject> _projectsCache;
+        private MemoryCacheDictionary<String, CachedPublishedProcedureProject> _projectsCache;
 
-        public PublishedTestProjectsService()
+        public PublishedProcedureProjectsService()
         {
-            _projectsCache = MemoryCache.GetOrCreateCache<String, CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+            _projectsCache = MemoryCache.GetOrCreateCache<String, CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
         }
 
-        public Task<List<PublishedTestProject>> GetPublishedTestProjects(bool visibleOnly = true)
+        public Task<List<PublishedProcedureProject>> GetPublishedProcedureProjects(bool visibleOnly = true)
         {
-            return DataResolver<List<PublishedTestProject>>.Builder.New()
+            return DataResolver<List<PublishedProcedureProject>>.Builder.New()
                 .ConfigureCascade(DataResolverNode.InMemoryCache, DataResolverNode.Online, DataResolverNode.DiskCache)
                 .InMemoryCache((context) =>
                 {
@@ -33,7 +33,7 @@ namespace Tango.FSE.BL.Services
 
                     if (projects.Count == 0)
                     {
-                        throw new IndexOutOfRangeException("The memory cache did not contain any test projects.");
+                        throw new IndexOutOfRangeException("The memory cache did not contain any procedure projects.");
                     }
 
                     return projects.OrderByDescending(x => x.PublishDate).ToList();
@@ -42,20 +42,20 @@ namespace Tango.FSE.BL.Services
                 {
                     using (ObservablesContext db = ObservablesContext.CreateDefault())
                     {
-                        var select = db.PublishedTestProjects
+                        var select = db.PublishedProcedureProjects
                         .Where(x => x.IsVisible || !visibleOnly)
-                        .Include(x => x.PublishedTestProjectsVersions)
+                        .Include(x => x.PublishedProcedureProjectsVersions)
                         .Select(x => new
                         {
                             Project = x,
-                            LatestVersion = x.PublishedTestProjectsVersions.OrderByDescending(v => v.Version).FirstOrDefault()
+                            LatestVersion = x.PublishedProcedureProjectsVersions.OrderByDescending(v => v.Version).FirstOrDefault()
                         }).ToList();
 
-                        List<PublishedTestProject> projects = new List<PublishedTestProject>();
+                        List<PublishedProcedureProject> projects = new List<PublishedProcedureProject>();
 
                         foreach (var p in select)
                         {
-                            PublishedTestProject project = p.Project;
+                            PublishedProcedureProject project = p.Project;
                             projects.Add(project);
                         }
 
@@ -63,11 +63,11 @@ namespace Tango.FSE.BL.Services
                         {
                             try
                             {
-                                var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                                var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
 
                                 foreach (var project in projects)
                                 {
-                                    var cachedProject = CachedPublishedTestProject.FromObservable<CachedPublishedTestProject>(project);
+                                    var cachedProject = CachedPublishedProcedureProject.FromObservable<CachedPublishedProcedureProject>(project);
                                     _projectsCache.Put(cachedProject.Guid, cachedProject);
 
                                     collection.Upsert(cachedProject);
@@ -75,7 +75,7 @@ namespace Tango.FSE.BL.Services
                             }
                             catch (Exception ex)
                             {
-                                LogManager.Log(ex, "Error caching published test projects.");
+                                LogManager.Log(ex, "Error caching published procedure projects.");
                             }
                         }
 
@@ -86,7 +86,7 @@ namespace Tango.FSE.BL.Services
                 {
                     using (var cache = DiskCache.CreateContext())
                     {
-                        var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                        var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
 
                         var cachedProjects = collection
                         .Find(x => x.IsVisible || !visibleOnly)
@@ -103,11 +103,11 @@ namespace Tango.FSE.BL.Services
                 .BuildExecuteAsync();
         }
 
-        public Task<PublishedTestProject> PublishTestProject(String projectGuid, String name, String description, String projectJson)
+        public Task<PublishedProcedureProject> PublishProcedureProject(String projectGuid, String name, String description, String projectJson)
         {
-            return Task.Factory.StartNew<PublishedTestProject>(() =>
+            return Task.Factory.StartNew<PublishedProcedureProject>(() =>
             {
-                if (!CurrentUser.HasPermission(Permissions.FSE_PublishTestProjects))
+                if (!CurrentUser.HasPermission(Permissions.FSE_PublishProcedureProjects))
                 {
                     throw new AuthorizationException();
                 }
@@ -122,7 +122,7 @@ namespace Tango.FSE.BL.Services
                     throw new ArgumentException("Cannot publish a project with an empty name.");
                 }
 
-                PublishedTestProject project = null;
+                PublishedProcedureProject project = null;
 
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
@@ -130,14 +130,14 @@ namespace Tango.FSE.BL.Services
 
                     if (projectGuid == null)
                     {
-                        project = new PublishedTestProject();
-                        db.PublishedTestProjects.Add(project);
+                        project = new PublishedProcedureProject();
+                        db.PublishedProcedureProjects.Add(project);
                     }
                     else
                     {
-                        project = db.PublishedTestProjects.SingleOrDefault(x => x.Guid == projectGuid);
+                        project = db.PublishedProcedureProjects.SingleOrDefault(x => x.Guid == projectGuid);
 
-                        int? lastVersion = db.PublishedTestProjectsVersions.Where(x => x.PublishedTestProjectGuid == project.Guid).Select(x => x.Version).OrderByDescending(x => x).FirstOrDefault();
+                        int? lastVersion = db.PublishedProcedureProjectsVersions.Where(x => x.PublishedProcedureProjectGuid == project.Guid).Select(x => x.Version).OrderByDescending(x => x).FirstOrDefault();
 
                         if (lastVersion != null)
                         {
@@ -150,31 +150,31 @@ namespace Tango.FSE.BL.Services
                     project.PublishDate = DateTime.UtcNow;
                     project.IsVisible = true;
 
-                    PublishedTestProjectsVersion projectVersion = new PublishedTestProjectsVersion();
+                    PublishedProcedureProjectsVersion projectVersion = new PublishedProcedureProjectsVersion();
                     projectVersion.Author = CurrentUser.Contact.FullName;
                     projectVersion.Version = version;
                     projectVersion.ProjectJsonString = projectJson;
-                    projectVersion.PublishedTestProject = project;
-                    projectVersion.PublishedTestProjectGuid = project.Guid;
+                    projectVersion.PublishedProcedureProject = project;
+                    projectVersion.PublishedProcedureProjectGuid = project.Guid;
 
-                    project.PublishedTestProjectsVersions.Add(projectVersion);
+                    project.PublishedProcedureProjectsVersions.Add(projectVersion);
 
                     db.SaveChanges();
 
-                    var versionsCount = db.PublishedTestProjectsVersions.Where(x => x.PublishedTestProjectGuid == project.Guid).Count();
+                    var versionsCount = db.PublishedProcedureProjectsVersions.Where(x => x.PublishedProcedureProjectGuid == project.Guid).Count();
 
                     if (versionsCount > 10)
                     {
-                        var firstVersion = db.PublishedTestProjectsVersions.Where(x => x.PublishedTestProjectGuid == project.Guid).OrderBy(x => x.Version).First();
-                        db.PublishedTestProjectsVersions.Remove(firstVersion);
+                        var firstVersion = db.PublishedProcedureProjectsVersions.Where(x => x.PublishedProcedureProjectGuid == project.Guid).OrderBy(x => x.Version).First();
+                        db.PublishedProcedureProjectsVersions.Remove(firstVersion);
                         db.SaveChanges();
                     }
 
                     using (var cache = DiskCache.CreateContext())
                     {
-                        var cachedProject = CachedPublishedTestProject.FromObservable<CachedPublishedTestProject>(project);
+                        var cachedProject = CachedPublishedProcedureProject.FromObservable<CachedPublishedProcedureProject>(project);
 
-                        var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                        var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
 
                         collection.Upsert(cachedProject);
 
@@ -186,19 +186,19 @@ namespace Tango.FSE.BL.Services
             });
         }
 
-        public Task<PublishedTestProject> UnPublishTestProject(PublishedTestProject project)
+        public Task<PublishedProcedureProject> UnPublishProcedureProject(PublishedProcedureProject project)
         {
-            return Task.Factory.StartNew<PublishedTestProject>(() =>
+            return Task.Factory.StartNew<PublishedProcedureProject>(() =>
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    db.PublishedTestProjects.Where(x => x.Guid == project.Guid).Update(x => new PublishedTestProject() { IsVisible = false });
+                    db.PublishedProcedureProjects.Where(x => x.Guid == project.Guid).Update(x => new PublishedProcedureProject() { IsVisible = false });
 
                     project.IsVisible = false;
 
                     using (var cache = DiskCache.CreateContext())
                     {
-                        var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                        var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
                         var cachedProject = collection.FindOne(x => x.Guid == project.Guid);
 
                         if (cachedProject != null)
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
index e548b03db..b1b0b300e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
@@ -82,7 +82,7 @@
   <ItemGroup>
     <Compile Include="AuthorizationException.cs" />
     <Compile Include="CacheEntities\CachedEventType.cs" />
-    <Compile Include="CacheEntities\CachedPublishedTestProject.cs" />
+    <Compile Include="CacheEntities\CachedPublishedProcedureProject.cs" />
     <Compile Include="EntityRepositoryBase.cs" />
     <Compile Include="MemoryCacheDictionary.cs" />
     <Compile Include="CacheEntities\CachedBugInfoResponse.cs" />
@@ -111,7 +111,7 @@
     <Compile Include="Services\MachineEventsService.cs" />
     <Compile Include="Services\MachinesService.cs" />
     <Compile Include="Services\OrganizationsService.cs" />
-    <Compile Include="Services\PublishedTestProjectsService.cs" />
+    <Compile Include="Services\PublishedProcedureProjectsService.cs" />
     <Compile Include="Services\TangoVersionsService.cs" />
     <Compile Include="Services\TechComponentsService.cs" />
     <Compile Include="Services\UsersService.cs" />