Project switching, reference nodes, .Net 5.0

steffendx · Jan 17, 2021 · 6ea236c · 6ea236c
1 parent f90bdfa
commit 6ea236c
Show file tree

Hide file tree

Showing 461 changed files with 13,266 additions and 5,624 deletions.
diff --git a/Config/MiscConfig.cs b/Config/MiscConfig.cs
@@ -48,7 +48,11 @@ public class MiscConfig
         /// <summary>
         /// CSV Delimiter
         /// </summary>
-        /// <value></value>
         public string CsvDelimiter { get; set; }
+
+        /// <summary>
+        /// Timeout for locks
+        /// </summary>
+        public int? ResourceLockTimespan { get; set;}
     }
 }
diff --git a/Constants.cs b/Constants.cs
@@ -9,5 +9,10 @@ public class Constants
         /// Minium Password Length
         /// </summary>
         public const int MinPasswordLength = 8;
+
+        /// <summary>
+        /// Default timespan for resource locks
+        /// </summary>
+        public const int DefaultResourceLockTimespan = 2;
     };
 }
diff --git a/Controllers/Api/AikaApiController.cs b/Controllers/Api/AikaApiController.cs
diff --git a/Controllers/Api/EvneApiController.cs b/Controllers/Api/EvneApiController.cs
@@ -22,6 +22,8 @@
 using System.Globalization;
 using Microsoft.AspNetCore.Http;
 using GoNorth.Services.CsvHandling;
+using GoNorth.Services.Project;
+using GoNorth.Services.Export.ExportSnippets;
 
 namespace GoNorth.Controllers.Api
 {
@@ -149,20 +151,21 @@ public class EvneApiController : FlexFieldBaseApiController<EvneSkill>
         /// <param name="folderDbAccess">Folder Db Access</param>
         /// <param name="templateDbAccess">Template Db Access</param>
         /// <param name="skillDbAccess">Skill Db Access</param>
-        /// <param name="projectDbAccess">User Db Access</param>
         /// <param name="tagDbAccess">Tag Db Access</param>
         /// <param name="exportTemplateDbAccess">Export Template Db Access</param>
         /// <param name="importFieldValuesLogDbAccess">Import field values log Db Access</param>
         /// <param name="languageKeyDbAccess">Language Key Db Access</param>
         /// <param name="exportFunctionIdDbAccess">Export Function Id Db Access</param>
         /// <param name="objectExportSnippetDbAccess">Object export snippet Db Access</param>
         /// <param name="objectExportSnippetSnapshotDbAccess">Object export snippet snapshot Db Access</param>
+        /// <param name="exportSnippetRelatedObjectNameResolver">Service that will resolve export snippet related object names</param>
         /// <param name="imageAccess">Skill Image Access</param>
         /// <param name="thumbnailService">Thumbnail Service</param>
         /// <param name="aikaQuestDbAccess">Aika Quest Db ACcess</param>
         /// <param name="kirjaPageDbAccess">Kirja Page Db Access</param>
         /// <param name="taleDbAccess">Tale Db Access</param>
         /// <param name="kortistoNpcDbAccess">Kortisto Npc Db Access</param>
+        /// <param name="userProjectAccess">User project Access</param>
         /// <param name="csvGenerator">CSV Generator</param>
         /// <param name="csvReader">CSV Reader</param>
         /// <param name="userManager">User Manager</param>
@@ -171,12 +174,12 @@ public class EvneApiController : FlexFieldBaseApiController<EvneSkill>
         /// <param name="xssChecker">Xss Checker</param>
         /// <param name="logger">Logger</param>
         /// <param name="localizerFactory">Localizer Factory</param>
-        public EvneApiController(IEvneFolderDbAccess folderDbAccess, IEvneSkillTemplateDbAccess templateDbAccess, IEvneSkillDbAccess skillDbAccess, IProjectDbAccess projectDbAccess, IEvneSkillTagDbAccess tagDbAccess, IExportTemplateDbAccess exportTemplateDbAccess, ILanguageKeyDbAccess languageKeyDbAccess, IEvneImportFieldValuesLogDbAccess importFieldValuesLogDbAccess,
-                                 IExportFunctionIdDbAccess exportFunctionIdDbAccess, IObjectExportSnippetDbAccess objectExportSnippetDbAccess, IObjectExportSnippetSnapshotDbAccess objectExportSnippetSnapshotDbAccess, IEvneSkillImageAccess imageAccess, IEvneThumbnailService thumbnailService, IAikaQuestDbAccess aikaQuestDbAccess, 
-                                 ITaleDbAccess taleDbAccess, IKirjaPageDbAccess kirjaPageDbAccess, IKortistoNpcDbAccess kortistoNpcDbAccess, ICsvGenerator csvGenerator, ICsvParser csvReader, UserManager<GoNorthUser> userManager, IImplementationStatusComparer implementationStatusComparer, ITimelineService timelineService, 
-                                 IXssChecker xssChecker, ILogger<EvneApiController> logger, IStringLocalizerFactory localizerFactory) 
-                                     : base(folderDbAccess, templateDbAccess, skillDbAccess, projectDbAccess, tagDbAccess, exportTemplateDbAccess, importFieldValuesLogDbAccess, languageKeyDbAccess, exportFunctionIdDbAccess, objectExportSnippetDbAccess, objectExportSnippetSnapshotDbAccess, imageAccess, thumbnailService, csvGenerator, csvReader, 
-                                            userManager, implementationStatusComparer, timelineService, xssChecker, logger, localizerFactory)
+        public EvneApiController(IEvneFolderDbAccess folderDbAccess, IEvneSkillTemplateDbAccess templateDbAccess, IEvneSkillDbAccess skillDbAccess, IEvneSkillTagDbAccess tagDbAccess, IExportTemplateDbAccess exportTemplateDbAccess, ILanguageKeyDbAccess languageKeyDbAccess, IEvneImportFieldValuesLogDbAccess importFieldValuesLogDbAccess,
+                                 IExportFunctionIdDbAccess exportFunctionIdDbAccess, IObjectExportSnippetDbAccess objectExportSnippetDbAccess, IObjectExportSnippetSnapshotDbAccess objectExportSnippetSnapshotDbAccess, IExportSnippetRelatedObjectNameResolver exportSnippetRelatedObjectNameResolver, IEvneSkillImageAccess imageAccess, 
+                                 IEvneThumbnailService thumbnailService, IAikaQuestDbAccess aikaQuestDbAccess, ITaleDbAccess taleDbAccess, IKirjaPageDbAccess kirjaPageDbAccess, IKortistoNpcDbAccess kortistoNpcDbAccess, IUserProjectAccess userProjectAccess, ICsvGenerator csvGenerator, ICsvParser csvReader, UserManager<GoNorthUser> userManager, 
+                                 IImplementationStatusComparer implementationStatusComparer, ITimelineService timelineService, IXssChecker xssChecker, ILogger<EvneApiController> logger, IStringLocalizerFactory localizerFactory) 
+                                     : base(folderDbAccess, templateDbAccess, skillDbAccess, tagDbAccess, exportTemplateDbAccess, importFieldValuesLogDbAccess, languageKeyDbAccess, exportFunctionIdDbAccess, objectExportSnippetDbAccess, objectExportSnippetSnapshotDbAccess, exportSnippetRelatedObjectNameResolver, userProjectAccess, imageAccess, 
+                                            thumbnailService, csvGenerator, csvReader, userManager, implementationStatusComparer, timelineService, xssChecker, logger, localizerFactory)
         {
             _aikaQuestDbAccess = aikaQuestDbAccess;
             _taleDbAccess = taleDbAccess;
@@ -299,6 +302,13 @@ protected override async Task<string> CheckObjectReferences(string id)
                 return _localizer["CanNotDeleteSkillUsedInDailyRoutine", usedInDailyRoutines].Value;
             }
 
+            List<EvneSkill> referencedInSkills = await ((IEvneSkillDbAccess)_objectDbAccess).GetSkillsObjectIsReferencedIn(id);
+            if(referencedInSkills.Count > 0)
+            {
+                string referencedInSkillsString = string.Join(", ", referencedInSkills.Select(n => n.Name));
+                return _localizer["CanNotDeleteSkillUsedInSkill", referencedInSkillsString].Value;
+            }
+
             return string.Empty;
         }
 
@@ -324,6 +334,7 @@ protected override Task<EvneSkill> RunAdditionalUpdates(EvneSkill flexFieldObjec
             loadedFlexFieldObject.Action = flexFieldObject.Action != null ? flexFieldObject.Action : new List<ActionNode>();
             loadedFlexFieldObject.Condition = flexFieldObject.Condition != null ? flexFieldObject.Condition : new List<ConditionNode>();
             loadedFlexFieldObject.Link = flexFieldObject.Link != null ? flexFieldObject.Link : new List<NodeLink>();
+            loadedFlexFieldObject.Reference = flexFieldObject.Reference != null ? flexFieldObject.Reference : new List<ReferenceNode>();
 
             return Task.FromResult(loadedFlexFieldObject);
         }
@@ -361,7 +372,7 @@ protected override async Task<CompareResult> CompareObjectWithImplementationSnap
         [HttpGet]
         public async Task<IActionResult> GetNotImplementedSkills(int start, int pageSize)
         {
-            GoNorthProject project = await _projectDbAccess.GetDefaultProject();
+            GoNorthProject project = await _userProjectAccess.GetUserProject();
             Task<List<EvneSkill>> queryTask;
             Task<int> countTask;
             queryTask = _objectDbAccess.GetNotImplementedFlexFieldObjects(project.Id, start, pageSize, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName);
@@ -374,5 +385,18 @@ public async Task<IActionResult> GetNotImplementedSkills(int start, int pageSize
             return Ok(queryResult);
         }
 
+        /// <summary>
+        /// Returns all skills an object is referenced in (excluding the skill itselfs)
+        /// </summary>
+        /// <param name="objectId">Object id</param>
+        /// <returns>Skills</returns>
+        [ProducesResponseType(typeof(List<EvneSkill>), StatusCodes.Status200OK)]
+        [HttpGet]
+        public async Task<IActionResult> GetSkillsObjectIsReferencedIn(string objectId)
+        {
+            List<EvneSkill> skills = await ((IEvneSkillDbAccess)_objectDbAccess).GetSkillsObjectIsReferencedIn(objectId);
+            return Ok(skills);
+        }
+
     }
 }