From b68d48e2a43d2ea528a3da60f95b23a0aa62ab68 Mon Sep 17 00:00:00 2001 From: Dona Jose Date: Wed, 20 Aug 2025 15:12:45 +0530 Subject: [PATCH 1/4] s3 initial commit --- Services/Workers/FileService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Services/Workers/FileService.cs b/Services/Workers/FileService.cs index d48f3b7..126af60 100644 --- a/Services/Workers/FileService.cs +++ b/Services/Workers/FileService.cs @@ -143,7 +143,7 @@ public EbMqResponse Post(UploadImageRequest request) try { Log.Info("FilesDB Collection Count: " + this.EbConnectionFactory.FilesDB.Count); - filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID); + filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); } catch (Exception e) { @@ -218,7 +218,7 @@ public EbMqResponse Post(UploadImageRequest request) if (thumbnailBytes.Length > 0) { - filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), thumbnailBytes, request.FileCategory, request.InfraConID); + filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), thumbnailBytes, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); DbParameter[] parametersImageSmall = { this.EbConnectionFactory.DataDB.GetNewParameter("refid", EbDbTypes.Int32, request.ImageRefId), @@ -270,7 +270,7 @@ public EbMqResponse Post(UploadDpRequest request) { this.EbConnectionFactory = new EbConnectionFactory(request.SolnId, this.Redis); - string filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID); + string filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); DbParameter[] parameters = { From 14e0f04c421f8ea2d36189b5e8652a8cc08763c7 Mon Sep 17 00:00:00 2001 From: Dona Jose Date: Thu, 28 Aug 2025 11:21:54 +0530 Subject: [PATCH 2/4] Logo, files, presigned url implemented --- Services/Workers/FileService.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Services/Workers/FileService.cs b/Services/Workers/FileService.cs index 126af60..a248e49 100644 --- a/Services/Workers/FileService.cs +++ b/Services/Workers/FileService.cs @@ -35,25 +35,16 @@ public EbMqResponse Post(UploadFileRequest request) { EbConnectionFactory _ebConnectionFactory = new EbConnectionFactory(request.SolnId, this.Redis); - string filestore_sid = _ebConnectionFactory.FilesDB.UploadFile( - request.FileRefId.ToString(), - request.Byte, - request.FileCategory, - request.InfraConID - ); + string filestore_sid = _ebConnectionFactory.FilesDB.UploadFile(request.FileRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); string sql = _ebConnectionFactory.DataDB.EB_MQ_UPLOADFILE; DbParameter[] parameters = { _ebConnectionFactory.DataDB.GetNewParameter("filestoresid",EbDbTypes.String, filestore_sid), - _ebConnectionFactory.DataDB.GetNewParameter("refid",EbDbTypes.Int32, request.FileRefId), - _ebConnectionFactory.DataDB.GetNewParameter("length",EbDbTypes.Int64, request.Byte.Length), - _ebConnectionFactory.DataDB.GetNewParameter("filedb_con_id", EbDbTypes.Int32, _ebConnectionFactory.FilesDB.UsedConId), - _ebConnectionFactory.DataDB.GetNewParameter("is_image",EbDbTypes.Boolean, false) }; @@ -387,7 +378,7 @@ public EbMqResponse Post(UploadLogoRequest request) // } //} - string filestore_sid = this.InfraConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID); + string filestore_sid = this.InfraConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); string sql = @"INSERT INTO eb_files_ref_variations (eb_files_ref_id, filestore_sid, length, imagequality_id, is_image, img_manp_ser_con_id, filedb_con_id) From c8bb5b2eb50c6809881e870dfa82e6839dbf86b2 Mon Sep 17 00:00:00 2001 From: Dona Jose Date: Thu, 11 Sep 2025 13:02:53 +0530 Subject: [PATCH 3/4] Is new fs filed in soln obj --- Services/Workers/FileService.cs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Services/Workers/FileService.cs b/Services/Workers/FileService.cs index a248e49..dbb6a78 100644 --- a/Services/Workers/FileService.cs +++ b/Services/Workers/FileService.cs @@ -3,6 +3,7 @@ using ExpressBase.Common.Data; using ExpressBase.Common.EbServiceStack.ReqNRes; using ExpressBase.Common.Enums; +using ExpressBase.Common.LocationNSolution; using ExpressBase.Common.ServerEvents_Artifacts; using ExpressBase.Common.ServiceClients; using ExpressBase.Common.Structures; @@ -26,6 +27,16 @@ public FileServiceInternal(IMessageProducer _mqp, IMessageQueueClient _mqc, IEbS ReqType = this.GetType().ToString() }; } + public bool IsNewFileServer(string solutionId) + { + if (solutionId != string.Empty) + { + Eb_Solution _solution = this.GetSolutionObject(solutionId); + return _solution?.SolutionSettings?.EnableNewFileServer ?? false; + } + else + return false; + } public EbMqResponse Post(UploadFileRequest request) { @@ -35,7 +46,7 @@ public EbMqResponse Post(UploadFileRequest request) { EbConnectionFactory _ebConnectionFactory = new EbConnectionFactory(request.SolnId, this.Redis); - string filestore_sid = _ebConnectionFactory.FilesDB.UploadFile(request.FileRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); + string filestore_sid = _ebConnectionFactory.FilesDB.UploadFile(request.FileRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request), IsNewFileServer(request.SolnId)); string sql = _ebConnectionFactory.DataDB.EB_MQ_UPLOADFILE; @@ -134,7 +145,7 @@ public EbMqResponse Post(UploadImageRequest request) try { Log.Info("FilesDB Collection Count: " + this.EbConnectionFactory.FilesDB.Count); - filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); + filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request),IsNewFileServer(request.SolnId)); } catch (Exception e) { @@ -209,7 +220,7 @@ public EbMqResponse Post(UploadImageRequest request) if (thumbnailBytes.Length > 0) { - filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), thumbnailBytes, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); + filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), thumbnailBytes, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request), IsNewFileServer(request.SolnId)); DbParameter[] parametersImageSmall = { this.EbConnectionFactory.DataDB.GetNewParameter("refid", EbDbTypes.Int32, request.ImageRefId), @@ -261,7 +272,7 @@ public EbMqResponse Post(UploadDpRequest request) { this.EbConnectionFactory = new EbConnectionFactory(request.SolnId, this.Redis); - string filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); + string filestore_sid = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request), IsNewFileServer(request.SolnId)); DbParameter[] parameters = { @@ -305,7 +316,7 @@ public EbMqResponse Post(UploadDpRequest request) request.ImgManpSerConId = this.EbConnectionFactory.ImageManipulate[0].InfraConId; byte[] smallByte = responseContent.ReadAsByteArrayAsync().Result; - string fStoreIdSmall = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), smallByte, request.FileCategory, request.InfraConID); + string fStoreIdSmall = this.EbConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), smallByte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request), IsNewFileServer(request.SolnId)); DbParameter[] smallImgParams = { @@ -378,7 +389,7 @@ public EbMqResponse Post(UploadLogoRequest request) // } //} - string filestore_sid = this.InfraConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request)); + string filestore_sid = this.InfraConnectionFactory.FilesDB.UploadFile(request.ImageRefId.ToString(), request.Byte, request.FileCategory, request.InfraConID, StaticFileConstants.GetFilePath(request), IsNewFileServer(request.SolnId)); string sql = @"INSERT INTO eb_files_ref_variations (eb_files_ref_id, filestore_sid, length, imagequality_id, is_image, img_manp_ser_con_id, filedb_con_id) From 52d7c46697a560e2a24568b356490c72873fd4d5 Mon Sep 17 00:00:00 2001 From: Dona Jose Date: Fri, 19 Sep 2025 01:48:12 +0530 Subject: [PATCH 4/4] implemented fs2 calling directly from backend --- Services/Workers/PdfMQService.cs | 3 ++- Startup.cs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Services/Workers/PdfMQService.cs b/Services/Workers/PdfMQService.cs index a8e5c1b..0938052 100644 --- a/Services/Workers/PdfMQService.cs +++ b/Services/Workers/PdfMQService.cs @@ -27,7 +27,7 @@ namespace ExpressBase.MessageQueue.Services.Workers [Restrict(InternalOnly = true)] public class PdfMQService : EbMqBaseService { - public PdfMQService(IEbConnectionFactory _dbf, IEbStaticFileClient _sfc, IMessageProducer _mqp, IMessageQueueClient _mqc, IServiceClient _ssclient, IEbServerEventClient _sec, PooledRedisClientManager pooledRedisManager) : base(_dbf, _sfc, _mqp, _mqc, _ssclient, _sec, pooledRedisManager) { } + public PdfMQService(IEbConnectionFactory _dbf, IEbStaticFileClient _sfc, IMessageProducer _mqp, IMessageQueueClient _mqc, IServiceClient _ssclient, IEbServerEventClient _sec, PooledRedisClientManager pooledRedisManager, EbStaticFileClient2 _sfc2) : base(_dbf, _sfc, _mqp, _mqc, _ssclient, _sec, pooledRedisManager, _sfc2) { } public MemoryStream Ms1 = null; @@ -71,6 +71,7 @@ public ReportRenderResponse Post(ReportRenderMultipleMQRequest request) reportObject.ObjectsDB = this.EbConnectionFactory.ObjectsDB; reportObject.Redis = this.Redis; reportObject.FileClient = this.FileClient; + reportObject.FileClient2 = this.FileClient2; reportObject.Solution = GetSolutionObject(request.SolnId); reportObject.ReadingUser = GetUserObject(request.ReadingUserAuthId); reportObject.RenderingUser = GetUserObject(request.RenderingUserAuthId); diff --git a/Startup.cs b/Startup.cs index 0805051..01a46d2 100644 --- a/Startup.cs +++ b/Startup.cs @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; +using System.Net.Http; using System.Reflection; //using Quartz; //using ServiceStack.Quartz; @@ -128,6 +129,7 @@ public override void Configure(Container container) container.Register(c => new EbConnectionFactory(c)).ReusedWithin(ReuseScope.Request); container.Register(c => new EbStaticFileClient()).ReusedWithin(ReuseScope.Request); + container.Register(c => new EbStaticFileClient2(new HttpClient())); RabbitMqMessageFactory rabitFactory = new RabbitMqMessageFactory(); rabitFactory.ConnectionFactory.UserName = Environment.GetEnvironmentVariable(EnvironmentConstants.EB_RABBIT_USER);