diff --git a/Marco.Pms.Services/Controllers/AuthController.cs b/Marco.Pms.Services/Controllers/AuthController.cs index 45eb303..b1ea681 100644 --- a/Marco.Pms.Services/Controllers/AuthController.cs +++ b/Marco.Pms.Services/Controllers/AuthController.cs @@ -1,19 +1,16 @@ -using System.Net; -using Marco.Pms.DataAccess.Data; +using Marco.Pms.DataAccess.Data; using Marco.Pms.Model.Authentication; using Marco.Pms.Model.Dtos; using Marco.Pms.Model.Dtos.Util; using Marco.Pms.Model.Employees; using Marco.Pms.Model.Entitlements; -using Marco.Pms.Model.Industries; -using Marco.Pms.Model.Mapper; using Marco.Pms.Model.Utilities; using MarcoBMS.Services.Helpers; using MarcoBMS.Services.Service; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Microsoft.VisualStudio.Web.CodeGenerators.Mvc.Templates.BlazorIdentity.Pages.Manage; +using System.Net; namespace MarcoBMS.Services.Controllers { @@ -205,27 +202,8 @@ namespace MarcoBMS.Services.Controllers return Ok(ApiResponse.SuccessResponse(result.Succeeded, "Password reset successfully.", 200)); } - [HttpPost("inquiry")] - public async Task RequestDemo([FromBody] InquiryDto inquiryDto) - { - Inquiries inquiry = inquiryDto.ToInquiriesFromInquiriesDto(); - _context.Inquiries.Add(inquiry); - await _context.SaveChangesAsync(); - - Industry industry = await _context.Industries.FirstOrDefaultAsync(i => i.Id == inquiryDto.IndustryId) ?? new Industry(); - if(industry != null && industry.Name != null) - { - InquiryEmailObject inquiryEmailObject = inquiryDto.ToInquiryEmailObjectFromInquiriesDto(industry.Name); - string emails = _configuration["Contact:Emails"]?? ""; - List result = emails - .Split(';', StringSplitOptions.RemoveEmptyEntries) - .Select(item => item.Trim()) - .ToList(); - await _emailSender.SendRequestDemoEmail(result, inquiryEmailObject); - return Ok(ApiResponse.SuccessResponse(new {}, "Email sent.", 200)); - } - return NotFound(ApiResponse.ErrorResponse("Industry not found.", "Industry not found.", 404)); - } + + [HttpPost("sendmail")] public async Task SendEmail([FromBody] EmailDot emailDot) { diff --git a/Marco.Pms.Services/Controllers/MarketController.cs b/Marco.Pms.Services/Controllers/MarketController.cs new file mode 100644 index 0000000..fd73996 --- /dev/null +++ b/Marco.Pms.Services/Controllers/MarketController.cs @@ -0,0 +1,60 @@ +using Marco.Pms.DataAccess.Data; +using Marco.Pms.Model.Dtos.Util; +using Marco.Pms.Model.Industries; +using Marco.Pms.Model.Mapper; +using Marco.Pms.Model.Utilities; +using MarcoBMS.Services.Helpers; +using MarcoBMS.Services.Service; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace Marco.Pms.Services.Controllers +{ + public class MarketController : ControllerBase + { + private readonly ApplicationDbContext _context; + private readonly UserHelper _userHelper; + private readonly IEmailSender _emailSender; + private readonly IConfiguration _configuration; + public MarketController(ApplicationDbContext context, UserHelper userHelper, RefreshTokenService refreshTokenService, + IEmailSender emailSender, IConfiguration configuration, EmployeeHelper employeeHelper) + { + _context = context; + _userHelper = userHelper; + _emailSender = emailSender; + _configuration = configuration; + } + + [HttpGet] + [Route("industries")] + public async Task GetIndustries() + { + var tenantId = _userHelper.GetTenantId(); + var industries = await _context.Industries.ToListAsync(); + + return Ok(ApiResponse.SuccessResponse(industries, "Success.", 200)); + } + + [HttpPost("inquiry")] + public async Task RequestDemo([FromBody] InquiryDto inquiryDto) + { + Inquiries inquiry = inquiryDto.ToInquiriesFromInquiriesDto(); + _context.Inquiries.Add(inquiry); + await _context.SaveChangesAsync(); + + Industry industry = await _context.Industries.FirstOrDefaultAsync(i => i.Id == inquiryDto.IndustryId) ?? new Industry(); + if (industry != null && industry.Name != null) + { + InquiryEmailObject inquiryEmailObject = inquiryDto.ToInquiryEmailObjectFromInquiriesDto(industry.Name); + string emails = _configuration["Contact:Emails"] ?? ""; + List result = emails + .Split(';', StringSplitOptions.RemoveEmptyEntries) + .Select(item => item.Trim()) + .ToList(); + await _emailSender.SendRequestDemoEmail(result, inquiryEmailObject); + return Ok(ApiResponse.SuccessResponse(new { }, "Email sent.", 200)); + } + return NotFound(ApiResponse.ErrorResponse("Industry not found.", "Industry not found.", 404)); + } + } +} diff --git a/Marco.Pms.Services/appsettings.json b/Marco.Pms.Services/appsettings.json index 0bb4f13..b42e486 100644 --- a/Marco.Pms.Services/appsettings.json +++ b/Marco.Pms.Services/appsettings.json @@ -64,8 +64,8 @@ "ConnectionStrings": { // "DefaultConnectionString": "Server=103.50.160.45;User ID=marcowvh_admin;Password=Marcoemp@123;Database=marcowvh_empattendanceci", - "DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2" - //"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1" + //"DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2" + "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1" }, "AppSettings": { "WebFrontendUrl": "http://localhost:5173",