Ensure better updating of translation count

Author: donker

Server/Core/Repositories/LocaleRepository.cs

@@ -2,43 +2,50 @@
 using DotNetNuke.Framework;
 using Connect.LanguagePackManager.Core.Models.Locales;
 using System.Collections.Generic;
+using Connect.LanguagePackManager.Core.Data;
 
 namespace Connect.LanguagePackManager.Core.Repositories
 {
-    public partial class LocaleRepository : ServiceLocator<ILocaleRepository, LocaleRepository>, ILocaleRepository
+  public partial class LocaleRepository : ServiceLocator<ILocaleRepository, LocaleRepository>, ILocaleRepository
+  {
+    public Locale GetOrCreateLocale(string code)
     {
-        public Locale GetOrCreateLocale(string code)
+      using (var context = DataContext.Instance())
+      {
+        var res = context.ExecuteSingleOrDefault<Locale>(System.Data.CommandType.Text, @"SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0;", code);
+        if (res == null)
         {
-            using (var context = DataContext.Instance())
-            {
-                if (code.IndexOf("-") > 0)
-                {
-                    var genericCode = code.Substring(0, code.IndexOf("-"));
-                    var genericLocale = this.GetOrCreateLocale(genericCode);
-                    context.Execute(System.Data.CommandType.Text, @"IF NOT EXISTS (SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0)
+          if (code.IndexOf("-") > 0)
+          {
+            var genericCode = code.Substring(0, code.IndexOf("-"));
+            var genericLocale = this.GetOrCreateLocale(genericCode);
+            context.Execute(System.Data.CommandType.Text, @"IF NOT EXISTS (SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0)
  INSERT INTO {databaseOwner}{objectQualifier}Connect_LPM_Locales (Code, GenericLocaleId) VALUES (@0, @1);", code, genericLocale.LocaleId);
-                }
-                else
-                {
-                    context.Execute(System.Data.CommandType.Text, @"IF NOT EXISTS (SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0)
+          }
+          else
+          {
+            context.Execute(System.Data.CommandType.Text, @"IF NOT EXISTS (SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0)
  INSERT INTO {databaseOwner}{objectQualifier}Connect_LPM_Locales (Code) VALUES (@0);", code);
-                }
-                return context.ExecuteSingleOrDefault<Locale>(System.Data.CommandType.Text, @"SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0;", code);
-            }
+          }
+          res = context.ExecuteSingleOrDefault<Locale>(System.Data.CommandType.Text, @"SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0;", code);
+          Sprocs.RefreshLocaleTextCount(res.LocaleId);
         }
-        public IEnumerable<Locale> GetLocaleChain(string code)
-        {
-            using (var context = DataContext.Instance())
-            {
-                return context.ExecuteQuery<Locale>(System.Data.CommandType.Text, @"SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0 OR Code=LEFT(@0,2) ORDER BY LEN(Code)", code);
-            }
-        }
-
+        return res;
+      }
     }
-    public partial interface ILocaleRepository
+    public IEnumerable<Locale> GetLocaleChain(string code)
     {
-        Locale GetOrCreateLocale(string code);
-        IEnumerable<Locale> GetLocaleChain(string code);
+      using (var context = DataContext.Instance())
+      {
+        return context.ExecuteQuery<Locale>(System.Data.CommandType.Text, @"SELECT * FROM {databaseOwner}{objectQualifier}Connect_LPM_Locales WHERE Code=@0 OR Code=LEFT(@0,2) ORDER BY LEN(Code)", code);
+      }
     }
+
+  }
+  public partial interface ILocaleRepository
+  {
+    Locale GetOrCreateLocale(string code);
+    IEnumerable<Locale> GetLocaleChain(string code);
+  }
 }
 

Server/Core/Services/Packages/LanguagePackManifest.cs

@@ -41,10 +41,15 @@ public LanguagePackManifest(UnzipResult unzipResult, int moduleId)
 
     public void Process(bool generic, int userId)
     {
+      var handledLocaleIds = new List<int>();
       foreach (var p in this.Components)
       {
         var locale = generic ? p.Locale.Substring(0, 2) : p.Locale;
         var localeId = LocaleRepository.Instance.GetOrCreateLocale(locale).LocaleId;
+        if (!handledLocaleIds.Contains(localeId))
+        {
+          handledLocaleIds.Add(localeId);
+        }
         var dbResFiles = ResourceFileRepository.Instance.GetResourceFilesByPackage(p.Package.PackageId);
         foreach (var rf in p.ResourceFiles)
         {
@@ -63,6 +68,16 @@ public void Process(bool generic, int userId)
           }
         }
       }
+      foreach (var loc in LocaleRepository.Instance.GetLocales())
+      {
+        foreach (var localeId in handledLocaleIds)
+        {
+          if (loc.LocaleId == localeId || loc.GenericLocaleId == localeId)
+          {
+            Sprocs.RefreshLocaleTextCount(loc.LocaleId);
+          }
+        }
+      }
     }
 
     private void LoadPackV5FromUploadedZipFile(UnzipResult unzipResult)

Server/LanguagePackManager/Api/PacksController.cs

@@ -60,13 +60,6 @@ public HttpResponseMessage TextStats(int id, string locale)
             var nrTexts = PackageVersionLocaleTextCountRepository.Instance.GetPackageVersionLocaleTextCounts(loc.LocaleId)
                 .Where(t => t.PackageId == id)
                 .ToList();
-            if (nrTexts.Count == 0)
-            {
-                Core.Data.Sprocs.RefreshLocaleTextCount(loc.LocaleId);
-                nrTexts = PackageVersionLocaleTextCountRepository.Instance.GetPackageVersionLocaleTextCounts(loc.LocaleId)
-                    .Where(t => t.PackageId == id)
-                    .ToList();
-            }
             return Request.CreateResponse(HttpStatusCode.OK, nrTexts);
         }
     }