Skip to content

Commit 2e485ef

Browse files
dgw-devdgw-dev
authored
Merge pull request #8 from dgw-dev/dw_main_dev
Code clean up and bug fixes
2 parents 3aa7d1a + 330477d commit 2e485ef

27 files changed

Lines changed: 46 additions & 497 deletions

‎DbLocalizer.Tests/ProgramTests.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎DbLocalizer.Tests/StartupTests.cs‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎DbLocalizer/Controllers/BaseController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected void LogMessage(string message, bool isError = false)
3535
}
3636
else
3737
{
38-
_logger.LogInformation(message);
38+
_logger.LogWarning(message);
3939
}
4040
}
4141
}

‎DbLocalizer/Program.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public static class Program
1313
public static async Task Main(string[] args)
1414
{
1515
var builder = CreateHostBuilder(args).Build();
16-
await SqliteUtility.CreateDatabase();
1716
await builder.RunAsync();
1817
}
1918

‎DbLocalizer/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void ConfigureServices(IServiceCollection services)
5353
services.AddSingleton<IBackgroundWorkerQueue, BackgroundWorkerQueue>();
5454
services.AddSingleton<ILongRunningService, LongRunningService>();
5555
services.AddHostedService<LongRunningService>(p => p.GetRequiredService<ILongRunningService>() as LongRunningService);
56-
services.AddHealthChecks().AddCheck<HealthChecker>("DTM");
56+
services.AddHealthChecks().AddCheck<HealthChecker>("DbLocalizer");
5757
services.AddQuartz(q => ConfiguredScheduledJobs(q, _configuration));
5858
services.AddScoped<IGenericRepository, GenericRepository>();
5959
services.AddScoped<IFileDataService, FileDataService>();

‎DbLocalizer/logs.db‎

0 Bytes
Binary file not shown.

‎Entities/BL/ExportBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ public abstract class ExportBase
1111
{
1212
protected ILogger _logger;
1313
public Guid ProcessId { get; set; }
14+
1415
protected readonly IExportDal _exportDal;
1516
public ExportTable ExportTable { get; set; }
1617
public DataSet Data { get; set; }
1718
public List<string> BaseTableChunk { get; set; }
1819
public string ExportLookbackInDays { get; set; }
1920
public string ExportType { get; set; }
2021

21-
2222
protected ExportBase(ILogger logger, Guid processId, IExportDal exportDal, string exportType)
2323
{
2424
_logger = logger;

‎Entities/BL/FileProcessorBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void PopulateExportTables(DataRow topLevelTableRowData, DataTable tableRo
150150
tableColumns,
151151
tableRows,
152152
(string)topLevelTableRowData["TableSchema"],
153-
(string)topLevelTableRowData["FullCultureTableName"]);
153+
(string)topLevelTableRowData["FullLocalizedTableName"]);
154154

155155
exportTables.Add((string)topLevelTableRowData["FullTableName"], exportTable);
156156
}

‎Entities/Plugins/TranslationManagement/GenericPluginInData.cs‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ public class GenericPluginInData : IGenericPluginInData
4040
return json;
4141
}
4242

43-
if (responseMessage.StatusCode == HttpStatusCode.Forbidden ||
44-
responseMessage.StatusCode == HttpStatusCode.Unauthorized)
45-
{
46-
// TODO: need error handling
47-
}
48-
4943
return default(T);
5044
}
5145
catch (Exception e)
@@ -84,12 +78,6 @@ public class GenericPluginInData : IGenericPluginInData
8478
return json;
8579
}
8680

87-
if (responseMessage.StatusCode == HttpStatusCode.Forbidden ||
88-
responseMessage.StatusCode == HttpStatusCode.Unauthorized)
89-
{
90-
// TODO: need error handling
91-
}
92-
9381
return default(T);
9482
}
9583
}
@@ -112,8 +100,6 @@ public async Task<bool> PostAsyncBool<T>(string uri, T data)
112100
var content = new StringContent(jsonObj);
113101
content.Headers.ContentType = new MediaTypeHeaderValue("multipart/form-data");
114102

115-
string jsonResult = string.Empty;
116-
117103
var responseMessage = await Policy
118104
.Handle<WebException>(ex =>
119105
{
@@ -133,12 +119,6 @@ public async Task<bool> PostAsyncBool<T>(string uri, T data)
133119
return true;
134120
}
135121

136-
if (responseMessage.StatusCode == HttpStatusCode.Forbidden ||
137-
responseMessage.StatusCode == HttpStatusCode.Unauthorized)
138-
{
139-
// TODO: need error handling
140-
}
141-
142122
return false;
143123
}
144124
}
@@ -189,8 +169,6 @@ public async Task<bool> PostAsyncBool<T>(string uri, T data)
189169
var content = new StringContent(JsonConvert.SerializeObject(data));
190170
content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
191171

192-
string jsonResult = string.Empty;
193-
194172
var responseMessage = await Policy
195173
.Handle<WebException>(ex =>
196174
{
@@ -209,12 +187,6 @@ public async Task<bool> PostAsyncBool<T>(string uri, T data)
209187
return true;
210188
}
211189

212-
if (responseMessage.StatusCode == HttpStatusCode.Forbidden ||
213-
responseMessage.StatusCode == HttpStatusCode.Unauthorized)
214-
{
215-
// TODO: need error handling
216-
}
217-
218190
return false;
219191
}
220192
}

‎Entities/Plugins/TranslationManagement/Smartling/SmartlingConfiguration.cs‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public sealed class SmartlingConfiguration : ISmartlingConfiguration
1515

1616
public SmartlingConfiguration(IConfiguration config)
1717
{
18-
//important, new instance otherwise we end up concatenating the uri over an over
1918
var smartlingSettings = config.Get<SmartlingSettings>();
2019
EndPoints = smartlingSettings.SmartlingEndPoints;
2120
SmartlingEndPoints endPointPaths = smartlingSettings.SmartlingEndPoints;
@@ -43,61 +42,6 @@ public SmartlingConfiguration(IConfiguration config)
4342
throw new ArgumentException("ServiceBaseUri is not set in appsettings.json");
4443
}
4544
}
46-
//private static SmartlingConfiguration _instance = null;
47-
//private static readonly object oLock = new object();
48-
49-
//private string _baseUri;
50-
//public required string workflowUid { get; private set; }
51-
//public required SmartlingEndPoints EndPoints { get; set; }
52-
//public required SmartlingAuthorization Authorization { get; set; }
53-
//private static SmartlingConfiguration Initialize(AppSettings appSettings)
54-
//{
55-
// SmartlingConfiguration config = new SmartlingConfiguration();
56-
// //important, new instance otherwise we end up concatenating the uri over an over
57-
// config.EndPoints = new SmartlingEndPoints();
58-
// SmartlingEndPoints endPointPaths = appSettings.SmartlingEndPoints;
59-
// config.Authorization = appSettings.SmartlingAuthorization;
60-
// config.workflowUid = appSettings.SmartlingWorkflowUid;
61-
// config._baseUri = appSettings.TranslationServiceBaseUri;
62-
63-
// if (!string.IsNullOrEmpty(config._baseUri) && config.EndPoints != null)
64-
// {
65-
// config.EndPoints.ExportAPI = config._baseUri + endPointPaths.ExportAPI;
66-
// config.EndPoints.ImportAPI = config._baseUri + endPointPaths.ImportAPI;
67-
// config.EndPoints.JobAPI = config._baseUri + endPointPaths.JobAPI;
68-
// config.EndPoints.JobBatchAPI = config._baseUri + endPointPaths.JobBatchAPI;
69-
// config.EndPoints.AuthenticateAPI = config._baseUri + endPointPaths.AuthenticateAPI;
70-
// config.EndPoints.DownloadFile = config._baseUri + endPointPaths.DownloadFile;
71-
// config.EndPoints.FileStatus = config._baseUri + endPointPaths.FileStatus;
72-
// }
73-
// else
74-
// {
75-
// throw new Exception("TranslationServiceBaseUri is not set in appsettings.json");
76-
// }
77-
78-
// return config;
79-
//}
80-
81-
//public static SmartlingConfiguration InitializeInstance(AppSettings appSettings)
82-
//{
83-
// lock (oLock)
84-
// {
85-
// if (_instance == null)
86-
// {
87-
// _instance = Initialize(appSettings);
88-
// }
89-
// return _instance;
90-
// }
91-
//}
92-
93-
//public static SmartlingConfiguration GetInstance()
94-
//{
95-
// return _instance;
96-
//}
97-
98-
//public SmartlingConfiguration Get()
99-
//{
100-
// return _instance;
101-
//}
45+
10246
}
10347
}

0 commit comments

Comments
 (0)