WebServer controller changes along with JSON settings

This commit is contained in:
2025-04-07 15:41:19 -04:00
parent f39d50af89
commit a7627e3f22
8 changed files with 40 additions and 96 deletions

View File

@@ -18,8 +18,8 @@ namespace MarketDataServer.Controllers
{
private ActiveGainLossGenerator gainLossGenerator=new ActiveGainLossGenerator();
[HttpGet(Name = "GetGainLoss")]
public IEnumerable<GainLossSummaryItem> GetGainLoss(String token, DateTime selectedDate)
[HttpGet]
public IEnumerable<GainLossSummaryItem> GetGainLossByDate(String token,DateTime selectedDate)
{
MDTrace.WriteLine(LogLevel.DEBUG,String.Format("[{0:G}][GainLossController::GetGainLoss](String token, DateTime selectedDate)", DateTime.Now));
if (!Authorizations.GetInstance().IsAuthorized(token)) return null;
@@ -53,8 +53,8 @@ namespace MarketDataServer.Controllers
return gainLossSummaryItems;
}
[HttpGet(Name = "GetGainLoss")]
public IEnumerable<GainLossSummaryItem> GetGainLoss(String token, DateTime selectedDate,String account)
[HttpGet]
public IEnumerable<GainLossSummaryItem> GetGainLossByDateAndAccount(String token,DateTime selectedDate,String account)
{
MDTrace.WriteLine(LogLevel.DEBUG,String.Format("[{0:G}][GainLossController::GetGainLoss](String token, DateTime selectedDate,String account)", DateTime.Now));
LocalPriceCache.GetInstance().Refresh();
@@ -89,8 +89,8 @@ namespace MarketDataServer.Controllers
return gainLossSummaryItems;
}
[HttpGet(Name = "GetGainLossWithDetail")]
public IEnumerable<GainLossSummaryItemDetail> GetGainLossWithDetail(String token, DateTime selectedDate)
[HttpGet]
public IEnumerable<GainLossSummaryItemDetail> GetGainLossWithDetailByDate(String token,DateTime selectedDate)
{
MDTrace.WriteLine(LogLevel.DEBUG,String.Format("[{0:G}][GainLossController::GetGainLossWithDetail](String token, DateTime selectedDate)", DateTime.Now));
if (!Authorizations.GetInstance().IsAuthorized(token)) return null;
@@ -175,8 +175,8 @@ namespace MarketDataServer.Controllers
return gainLossSummaryItemDetailCollection;
}
[HttpGet(Name = "GetGainLossWithDetail")]
public IEnumerable<GainLossSummaryItemDetail> GetGainLossWithDetail(String token, DateTime selectedDate, String account)
[HttpGet]
public IEnumerable<GainLossSummaryItemDetail> GetGainLossWithDetailByDateAndAccount(String token, DateTime selectedDate, String account)
{
MDTrace.WriteLine(LogLevel.DEBUG,String.Format("[{0:G}][GainLossController::GetGainLossWithDetail](String token, DateTime selectedDate,String account)", DateTime.Now));
if (!Authorizations.GetInstance().IsAuthorized(token)) return null;

View File

@@ -1,7 +1,10 @@
using System.Diagnostics;
using System.Text.Json;
using System.Text.Json.Serialization;
using MarketData;
using MarketData.Configuration;
using MarketData.Utils;
using Microsoft.AspNetCore.Mvc;
using MarketDataServer.Authorization;
namespace MarketDataServer
@@ -13,7 +16,7 @@ namespace MarketDataServer
String logFileName="marketdataserver";
Authorizations.GetInstance().IsEnabled=false;
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
// Add services to the container.
GlobalConfig.Instance.Configuration = builder.Configuration;
String baseAddress = GlobalConfig.Instance.Configuration["server_address"];
@@ -21,7 +24,16 @@ namespace MarketDataServer
MDTrace.WriteLine(MarketData.LogLevel.DEBUG,$"Server Address:{baseAddress}");
builder.Services.AddControllers();
builder.Services.AddControllers().AddJsonOptions(options =>
{
options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
options.JsonSerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase;
options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.WriteAsString;
options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
});
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen( config =>
{

View File

@@ -2,7 +2,7 @@
"market_data" : "Database=market_data;Datasource=euporie;Username=guest;Password=guest",
"portfolio_data" : "Database=portfolio_data;Datasource=euporie;Username=guest;Password=guest",
"user_data" : "Database=user_data;Datasource=euporie;Username=guest;Password=guest",
"server_address" : "http://localhost:8000/",
"server_address" : "http://0.0.0.0:8000/",
"sms_smtpaddress" : "smtp.gmail.com",
"sms_smsusername" : "skessler1964@gmail.com",
"sms_smspassword" : "xjfo isnf gmyi zovr",