30-11-23
This commit is contained in:
@@ -18,7 +18,7 @@ namespace EnvelopeGenerator.Web.Controllers
|
||||
this.database = database;
|
||||
this.logConfig = logging.LogConfig;
|
||||
this.logger = logging.LogConfig.GetLoggerFor(GetType().Name);
|
||||
this.state = GetState();
|
||||
this.state = database.State;
|
||||
}
|
||||
|
||||
internal ObjectResult ErrorResponse(Exception e)
|
||||
@@ -29,15 +29,5 @@ namespace EnvelopeGenerator.Web.Controllers
|
||||
detail: e.Message,
|
||||
type: ErrorType.ServerError.ToString());
|
||||
}
|
||||
|
||||
internal State GetState()
|
||||
{
|
||||
return new State
|
||||
{
|
||||
Database = database.MSSQL,
|
||||
LogConfig = logConfig,
|
||||
UserId = 2 // TODO
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using EnvelopeGenerator.Common;
|
||||
using EnvelopeGenerator.Web.Services;
|
||||
using static EnvelopeGenerator.Common.Constants;
|
||||
|
||||
namespace EnvelopeGenerator.Web.Controllers
|
||||
{
|
||||
public class DocumentController : BaseController
|
||||
{
|
||||
private readonly EnvelopeService envelopeService;
|
||||
private readonly ActionService? actionService;
|
||||
|
||||
public DocumentController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
||||
{
|
||||
envelopeService = envelope;
|
||||
actionService = database.Services?.actionService;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
@@ -40,5 +43,28 @@ namespace EnvelopeGenerator.Web.Controllers
|
||||
return ErrorResponse(e);
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("api/document/{envelopeKey}")]
|
||||
public IActionResult Open(string envelopeKey)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger.Info("DocumentController/Open");
|
||||
|
||||
// Validate Envelope Key and load envelope
|
||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
||||
EnvelopeResponse response = envelopeService.LoadEnvelope(envelopeKey);
|
||||
|
||||
actionService.OpenEnvelope(response.Envelope, response.Receiver.Id);
|
||||
|
||||
return Ok();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return ErrorResponse(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,12 +7,12 @@ namespace EnvelopeGenerator.Web.Controllers
|
||||
public class EnvelopeController : BaseController
|
||||
{
|
||||
private readonly EnvelopeService envelopeService;
|
||||
private readonly EmailService emailService;
|
||||
private readonly ActionService actionService;
|
||||
|
||||
public EnvelopeController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
||||
{
|
||||
envelopeService = envelope;
|
||||
emailService = new(state);
|
||||
actionService = database.Services?.actionService;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
@@ -52,17 +52,19 @@ namespace EnvelopeGenerator.Web.Controllers
|
||||
|
||||
string annotationData = await envelopeService.EnsureValidAnnotationData(Request);
|
||||
|
||||
envelopeService.InsertDocumentStatus(new DocumentStatus()
|
||||
{
|
||||
EnvelopeId = response.Envelope.Id,
|
||||
ReceiverId = response.Receiver.Id,
|
||||
Value = annotationData,
|
||||
Status = Common.Constants.DocumentStatus.Signed
|
||||
});
|
||||
//envelopeService.InsertDocumentStatus(new DocumentStatus()
|
||||
//{
|
||||
// EnvelopeId = response.Envelope.Id,
|
||||
// ReceiverId = response.Receiver.Id,
|
||||
// Value = annotationData,
|
||||
// Status = Common.Constants.DocumentStatus.Signed
|
||||
//});
|
||||
|
||||
envelopeService.InsertHistoryEntrySigned(response);
|
||||
//envelopeService.InsertHistoryEntrySigned(response);
|
||||
|
||||
emailService.SendSignedEmail(response.Receiver.Id, response.Envelope.Id);
|
||||
//emailService.SendSignedEmail(response.Receiver.Id, response.Envelope.Id);
|
||||
|
||||
var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver.Id);
|
||||
|
||||
return Ok();
|
||||
}
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
using EnvelopeGenerator.Common;
|
||||
using EnvelopeGenerator.Web.Services;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using static EnvelopeGenerator.Common.Constants;
|
||||
|
||||
namespace EnvelopeGenerator.Web.Controllers
|
||||
{
|
||||
public class HistoryController : BaseController
|
||||
{
|
||||
private readonly EnvelopeService envelopeService;
|
||||
|
||||
public HistoryController(DatabaseService database, LoggingService logging, EnvelopeService envelope) : base(database, logging)
|
||||
{
|
||||
envelopeService = envelope;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("api/history/{envelopeKey}")]
|
||||
public IActionResult Get(string envelopeKey)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger.Info("HistoryController/Post");
|
||||
|
||||
// Validate Envelope Key and load envelope
|
||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
||||
EnvelopeResponse response = envelopeService.LoadEnvelope(envelopeKey);
|
||||
|
||||
envelopeService.InsertHistoryEntry(new EnvelopeHistoryEntry()
|
||||
{
|
||||
ActionDate = DateTime.Now,
|
||||
Status = EnvelopeStatus.DocumentOpened,
|
||||
EnvelopeId = response.Envelope.Id,
|
||||
UserReference = response.Receiver.Email
|
||||
});
|
||||
|
||||
return Ok();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return ErrorResponse(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user