forked from MDCPS/DamageAssessment_Backend
Merged new dev changes
This commit is contained in:
@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
this.uploadservice = uploadservice;
|
||||
SeedData();
|
||||
//SeedData();
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
||||
{
|
||||
@ -65,14 +65,15 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Db.Attachment> Attachments)
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Attachment");
|
||||
AttachmentDbContext.Attachments.AddRange(Attachments);
|
||||
AttachmentDbContext.SaveChanges();
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
|
||||
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
||||
AttachmentDbContext.Attachments.AddRange(attachments);
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -82,14 +83,15 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Db.Attachment> Attachments)
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Attachment");
|
||||
AttachmentDbContext.Attachments.UpdateRange(Attachments);
|
||||
AttachmentDbContext.SaveChanges();
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
|
||||
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
||||
AttachmentDbContext.Attachments.UpdateRange(attachments);
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -108,7 +110,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
if (Attachments.Count > 0)
|
||||
{
|
||||
AttachmentDbContext.Attachments.RemoveRange(Attachments);
|
||||
AttachmentDbContext.SaveChanges();
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
}
|
||||
return (true, AttachmentId, "");
|
||||
}
|
||||
@ -141,7 +143,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
if (Attachments.Count > 0)
|
||||
{
|
||||
AttachmentDbContext.Attachments.RemoveRange(Attachments);
|
||||
AttachmentDbContext.SaveChanges();
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
}
|
||||
return (true, AttachmentId, "");
|
||||
}
|
||||
@ -152,7 +154,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
return (false, AttachmentId, "");
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)>GetAttachmentInfo(List<AnswerInfo> answers)
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -181,7 +183,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
}
|
||||
Attachment.IsDeleted = true;
|
||||
AttachmentDbContext.Attachments.Update(Attachment);
|
||||
AttachmentDbContext.SaveChanges();
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id} is deleted");
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -204,10 +206,11 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
FileModel fileModel= new FileModel(){AttachmentId=0,FileName="Sample",FileContent= "c2FtcGxl",FileExtension=".txt"};
|
||||
List<AnswerInfo> answerInfos=new List<AnswerInfo>();
|
||||
answerInfos.Add(new AnswerInfo(){ AnswerId = 1,postedFiles=new List<FileModel> { fileModel }});
|
||||
List<Db.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
|
||||
List<Models.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
|
||||
if (attachments.Count > 0)
|
||||
{
|
||||
AttachmentDbContext.Attachments.AddRange(attachments);
|
||||
List<Db.Attachment> Attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(attachments);
|
||||
AttachmentDbContext.Attachments.AddRange(Attachments);
|
||||
AttachmentDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||
}
|
||||
public List<Db.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
|
||||
public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
|
||||
{
|
||||
var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
|
||||
String responseDirectory = "Response-" + responseId;
|
||||
@ -42,7 +42,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
Deletefile(searchFile);
|
||||
}
|
||||
}
|
||||
List<Db.Attachment> attachments = new List<Db.Attachment>();
|
||||
List<Models.Attachment> attachments = new List<Models.Attachment>();
|
||||
foreach (IFormFile item in postedFile)
|
||||
{
|
||||
|
||||
@ -55,15 +55,15 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
{
|
||||
item.CopyTo(stream);
|
||||
}
|
||||
attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
}
|
||||
|
||||
return attachments;
|
||||
}
|
||||
|
||||
public List<Db.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
|
||||
public List<Models.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
|
||||
{
|
||||
List<Db.Attachment> attachments = new List<Db.Attachment>();
|
||||
List<Models.Attachment> attachments = new List<Models.Attachment>();
|
||||
try
|
||||
{
|
||||
foreach (var item in answers)
|
||||
@ -94,20 +94,20 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||
|
||||
attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
}
|
||||
}
|
||||
return attachments;
|
||||
}
|
||||
catch (Exception ex) {
|
||||
return new List<Db.Attachment>();
|
||||
return new List<Models.Attachment>();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
public List<Db.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
|
||||
public List<Models.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
|
||||
{
|
||||
List<Db.Attachment> Dbattachments = new List<Db.Attachment>();
|
||||
List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
|
||||
foreach (Models.Attachment searchFile in attachments)
|
||||
{
|
||||
Deletefile(searchFile.URI);
|
||||
@ -131,7 +131,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||
|
||||
Dbattachments.Add(new Db.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
Dbattachments.Add(new Models.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
}
|
||||
}
|
||||
return Dbattachments;
|
||||
|
Reference in New Issue
Block a user