Merge branch 'develop' into TM-309

This commit is contained in:
Mazyar
2025-12-08 12:08:44 +03:30
12 changed files with 768 additions and 27 deletions
+349
View File
@@ -0,0 +1,349 @@
package contact
import (
"fmt"
"strings"
"time"
)
// ContactEmailTemplateData represents the data needed for contact confirmation email
type ContactEmailTemplateData struct {
FullName string
Email string
Phone string
Message string
ContactID string
SubmittedAt int64
CompanyName string
CompanyURL string
SupportEmail string
}
// GenerateContactConfirmationEmailTemplate generates a beautiful HTML email template for contact confirmation
func GenerateContactConfirmationEmailTemplate(data *ContactEmailTemplateData) string {
// Format the submission date
submittedAt := time.Unix(data.SubmittedAt, 0).Format("January 2, 2006 at 3:04 PM")
html := `
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Contact Confirmation - ` + data.CompanyName + `</title>
<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
line-height: 1.6;
color: #333;
background-color: #f8fafc;
}
.email-container {
max-width: 600px;
margin: 16px auto;
background-color: #ffffff;
border-radius: 12px;
overflow: hidden;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
}
.header {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
padding: 40px 30px;
text-align: center;
color: white;
}
.header h1 {
font-size: 28px;
font-weight: 700;
margin-bottom: 10px;
text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.header p {
font-size: 16px;
opacity: 0.9;
font-weight: 300;
}
.content {
padding: 40px 30px;
}
.confirmation-card {
background-color: #f0f9ff;
border: 2px solid #0ea5e9;
border-radius: 12px;
padding: 30px;
margin: 30px 0;
position: relative;
}
.confirmation-card::before {
content: '✓';
position: absolute;
top: -15px;
left: 20px;
background-color: #0ea5e9;
color: white;
width: 30px;
height: 30px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
font-size: 18px;
font-weight: bold;
}
.success-message {
color: #0c4a6e;
font-size: 18px;
font-weight: 600;
margin-bottom: 20px;
text-align: center;
}
.contact-details {
background-color: white;
border-radius: 8px;
padding: 20px;
margin: 20px 0;
border-left: 4px solid #0ea5e9;
}
.detail-row {
display: flex;
margin-bottom: 12px;
align-items: flex-start;
}
.detail-label {
font-weight: 600;
color: #374151;
min-width: 120px;
font-size: 14px;
}
.detail-value {
color: #6b7280;
flex: 1;
font-size: 14px;
}
.message-preview {
background-color: #f9fafb;
border-radius: 8px;
padding: 15px;
margin-top: 15px;
border-left: 3px solid #6b7280;
}
.message-preview strong {
color: #374151;
display: block;
margin-bottom: 8px;
}
.timestamp {
text-align: center;
color: #6b7280;
font-size: 14px;
margin-top: 20px;
padding-top: 20px;
border-top: 1px solid #e5e7eb;
}
.footer {
background-color: #f8fafc;
padding: 30px;
text-align: center;
border-top: 1px solid #e5e7eb;
}
.footer p {
color: #6b7280;
font-size: 14px;
margin-bottom: 10px;
}
.footer a {
color: #667eea;
text-decoration: none;
}
.footer a:hover {
text-decoration: underline;
}
.support-info {
background-color: #fffbeb;
border: 1px solid #fbbf24;
border-radius: 8px;
padding: 15px;
margin-top: 20px;
}
.support-info h4 {
color: #92400e;
margin-bottom: 8px;
font-size: 16px;
}
.support-info p {
color: #78350f;
font-size: 14px;
margin-bottom: 5px;
}
@media (max-width: 600px) {
.email-container {
margin: 16px;
border-radius: 0;
}
.content {
padding: 20px;
}
.detail-row {
flex-direction: column;
gap: 4px;
}
.header {
padding: 30px 20px;
}
.header h1 {
font-size: 24px;
}
}
</style>
</head>
<body>
<div class="email-container">
<!-- Header -->
<div class="header">
<h1>Thank You for Contacting Us!</h1>
<p>Your message has been received and we'll get back to you soon.</p>
</div>
<!-- Content -->
<div class="content">
<div class="confirmation-card">
<div class="success-message">
✓ Your contact form has been submitted successfully!
</div>
<div class="contact-details">
<div class="detail-row">
<span class="detail-label">Full Name:</span>
<span class="detail-value">{{FULL_NAME}}</span>
</div>
<div class="detail-row">
<span class="detail-label">Email:</span>
<span class="detail-value">{{EMAIL}}</span>
</div>
<div class="detail-row">
<span class="detail-label">Phone:</span>
<span class="detail-value">{{PHONE}}</span>
</div>
<div class="detail-row">
<span class="detail-label">Reference ID:</span>
<span class="detail-value">{{CONTACT_ID}}</span>
</div>
<div class="message-preview">
<strong>Your Message:</strong>
{{MESSAGE}}
</div>
</div>
<div class="timestamp">
<strong>Submitted on:</strong> {{SUBMITTED_AT}}
<br>
<p>This email confirms your submission to ` + data.CompanyName + `</p>
</div>
</div>
<div class="support-info">
<h4>Need Immediate Assistance?</h4>
<p><strong>Email:</strong> <a href="mailto:{{SUPPORT_EMAIL}}">{{SUPPORT_EMAIL}}</a></p>
<p><strong>Website:</strong> <a href="{{COMPANY_URL}}" target="_blank">{{COMPANY_URL}}</a></p>
<p>Our team typically responds within 24 hours during business days.</p>
</div>
</div>
<!-- Footer -->
<div class="footer">
<p>This is an automated confirmation email from ` + data.CompanyName + `</p>
<p>Please do not reply to this email. For questions, contact us at <a href="mailto:{{SUPPORT_EMAIL}}">{{SUPPORT_EMAIL}}</a></p>
</div>
</div>
</body>
</html>`
// Replace placeholders with actual data
html = strings.ReplaceAll(html, "{{COMPANY_NAME}}", data.CompanyName)
html = strings.ReplaceAll(html, "{{FULL_NAME}}", data.FullName)
html = strings.ReplaceAll(html, "{{EMAIL}}", data.Email)
html = strings.ReplaceAll(html, "{{PHONE}}", data.Phone)
html = strings.ReplaceAll(html, "{{CONTACT_ID}}", data.ContactID)
html = strings.ReplaceAll(html, "{{MESSAGE}}", data.Message)
html = strings.ReplaceAll(html, "{{SUBMITTED_AT}}", submittedAt)
html = strings.ReplaceAll(html, "{{COMPANY_URL}}", data.CompanyURL)
html = strings.ReplaceAll(html, "{{SUPPORT_EMAIL}}", data.SupportEmail)
return html
}
// GenerateContactConfirmationEmailMessage generates a simple text message for the email
func GenerateContactConfirmationEmailMessage(data *ContactEmailTemplateData) string {
submittedAt := time.Unix(data.SubmittedAt, 0).Format("January 2, 2006 at 3:04 PM")
return fmt.Sprintf(`
Contact Form Submission Confirmation
Thank you for contacting us! Your message has been received successfully.
Contact Details:
- Full Name: %s
- Email: %s
- Phone: %s
- Reference ID: %s
- Submitted on: %s
Your Message:
%s
Our team will review your inquiry and get back to you within 24 hours during business days.
For urgent matters, please contact us directly:
Email: %s
Website: %s
This is an automated confirmation email from %s.
Please do not reply to this email.
`,
data.FullName,
data.Email,
data.Phone,
data.ContactID,
submittedAt,
data.Message,
data.SupportEmail,
data.CompanyURL,
data.CompanyName,
)
}
+50 -1
View File
@@ -5,6 +5,7 @@ import (
"fmt"
"tm/pkg/logger"
orm "tm/pkg/mongo"
"tm/pkg/notification"
"tm/pkg/response"
)
@@ -33,13 +34,15 @@ type Service interface {
type contactService struct {
repo ContactRepository
logger logger.Logger
sdk notification.SDK
}
// NewService creates a new contact service
func NewService(repo ContactRepository, logger logger.Logger) Service {
func NewService(repo ContactRepository, logger logger.Logger, sdk notification.SDK) Service {
return &contactService{
repo: repo,
logger: logger,
sdk: sdk,
}
}
@@ -68,6 +71,52 @@ func (s *contactService) Create(ctx context.Context, form *CreateContactForm) (*
return nil, fmt.Errorf("failed to create contact: %w", err)
}
// Send confirmation email
s.sdk.SendNotification(ctx, &notification.NotificationRequest{
UserID: contact.GetID(),
Title: "Contact Form Submission Confirmation",
Message: GenerateContactConfirmationEmailTemplate(&ContactEmailTemplateData{
FullName: contact.FullName,
Email: contact.Email,
Phone: contact.Phone,
Message: contact.Message,
ContactID: contact.GetID(),
SubmittedAt: contact.CreatedAt,
CompanyName: "Opplens",
CompanyURL: "https://opplens.com",
SupportEmail: "info@opplens.com",
}),
Type: "confirmation",
Priority: "normal",
EventType: notification.EventTypeEmail,
Methods: notification.NotificationMethods{
Email: contact.Email,
},
})
// Notify admin/internal team
s.sdk.SendNotification(ctx, &notification.NotificationRequest{
UserID: contact.GetID(),
Title: fmt.Sprintf("New Contact Form Submission from %s", contact.FullName),
Message: GenerateContactConfirmationEmailTemplate(&ContactEmailTemplateData{
FullName: contact.FullName,
Email: contact.Email,
Phone: contact.Phone,
Message: contact.Message,
ContactID: contact.GetID(),
SubmittedAt: contact.CreatedAt,
CompanyName: "Opplens",
CompanyURL: "https://opplens.com",
SupportEmail: "info@opplens.com",
}),
Type: "alert",
Priority: "normal",
EventType: notification.EventTypeEmail,
Methods: notification.NotificationMethods{
Email: "info@opplens.com",
},
})
s.logger.Info("Contact message created successfully", map[string]interface{}{
"id": contact.GetID(),
"email": form.Email,
+17 -7
View File
@@ -2,8 +2,11 @@ package inquiry
import (
"fmt"
"html"
"strings"
"time"
"tm/pkg/security"
)
// EmailTemplateData represents the data needed for the email template
@@ -20,7 +23,14 @@ type EmailTemplateData struct {
}
// GenerateNewInquiryEmailTemplate generates a beautiful HTML email template for new inquiry notifications
func GenerateNewInquiryEmailTemplate(data *EmailTemplateData) string {
func GenerateNewInquiryEmailTemplate(data *EmailTemplateData, xssPolicy *security.XSSPolicy) string {
// Sanitize all user inputs before inserting into HTML
safeFullName := html.EscapeString(data.FullName)
safeCompanyName := html.EscapeString(data.CompanyName)
safeWorkEmail := html.EscapeString(data.WorkEmail)
safePhoneNumber := html.EscapeString(data.PhoneNumber)
safeInquiryID := html.EscapeString(data.InquiryID)
// Format the creation date
createdAt := time.Unix(data.CreatedAt, 0).Format("January 2, 2006 at 3:04 PM")
@@ -249,12 +259,12 @@ func GenerateNewInquiryEmailTemplate(data *EmailTemplateData) string {
</body>
</html>`
// Replace placeholders with actual data
html = strings.ReplaceAll(html, "{{COMPANY_NAME}}", data.CompanyName)
html = strings.ReplaceAll(html, "{{INQUIRY_ID}}", data.InquiryID)
html = strings.ReplaceAll(html, "{{FULL_NAME}}", data.FullName)
html = strings.ReplaceAll(html, "{{WORK_EMAIL}}", data.WorkEmail)
html = strings.ReplaceAll(html, "{{PHONE_NUMBER}}", data.PhoneNumber)
// Replace placeholders with sanitized data
html = strings.ReplaceAll(html, "{{COMPANY_NAME}}", safeCompanyName)
html = strings.ReplaceAll(html, "{{INQUIRY_ID}}", safeInquiryID)
html = strings.ReplaceAll(html, "{{FULL_NAME}}", safeFullName)
html = strings.ReplaceAll(html, "{{WORK_EMAIL}}", safeWorkEmail)
html = strings.ReplaceAll(html, "{{PHONE_NUMBER}}", safePhoneNumber)
html = strings.ReplaceAll(html, "{{CREATED_AT}}", createdAt)
return html
+75 -1
View File
@@ -1,6 +1,11 @@
package inquiry
import "tm/pkg/response"
import (
"tm/pkg/response"
"tm/pkg/security"
"github.com/asaskevich/govalidator"
)
// Inquiry DTOs
@@ -84,3 +89,72 @@ func (i *Inquiry) ToResponse() *InquiryResponse {
UpdatedAt: i.UpdatedAt,
}
}
// ValidateAndSanitize validates and sanitizes the form
func (f *CreateInquiryForm) ValidateAndSanitize(xssPolicy *security.XSSPolicy) error {
var err error
// Sanitize and validate FullName
f.FullName, err = xssPolicy.ValidateAndSanitizeInput(f.FullName, "text")
if err != nil {
return err
}
// Sanitize and validate CompanyName
f.CompanyName, err = xssPolicy.ValidateAndSanitizeInput(f.CompanyName, "text")
if err != nil {
return err
}
// Sanitize and validate WorkEmail (email validation is separate)
f.WorkEmail, err = xssPolicy.ValidateAndSanitizeInput(f.WorkEmail, "email")
if err != nil {
return err
}
// Sanitize and validate PhoneNumber
f.PhoneNumber, err = xssPolicy.ValidateAndSanitizeInput(f.PhoneNumber, "phone")
if err != nil {
return err
}
// Standard govalidator validation
_, err = govalidator.ValidateStruct(f)
return err
}
// ValidateAndSanitize validates and sanitizes the status update form
func (f *UpdateInquiryStatusForm) ValidateAndSanitize(xssPolicy *security.XSSPolicy) error {
var err error
// Sanitize Reason
f.Reason, err = xssPolicy.ValidateAndSanitizeInput(f.Reason, "text")
if err != nil {
return err
}
// Sanitize Description
f.Description, err = xssPolicy.ValidateAndSanitizeInput(f.Description, "html")
if err != nil {
return err
}
// Standard govalidator validation
_, err = govalidator.ValidateStruct(f)
return err
}
// ValidateAndSanitize validates and sanitizes the search form
func (f *SearchInquiriesForm) ValidateAndSanitize(xssPolicy *security.XSSPolicy) error {
if f.Search != nil {
sanitized, err := xssPolicy.ValidateAndSanitizeInput(*f.Search, "text")
if err != nil {
return err
}
*f.Search = sanitized
}
// Standard govalidator validation
_, err := govalidator.ValidateStruct(f)
return err
}
+10 -8
View File
@@ -5,8 +5,8 @@ import (
"tm/pkg/hcaptcha"
"tm/pkg/logger"
"tm/pkg/response"
"tm/pkg/security"
"github.com/asaskevich/govalidator"
"github.com/labstack/echo/v4"
)
@@ -15,14 +15,16 @@ type Handler struct {
service Service
logger logger.Logger
hcaptchaVerifier hcaptcha.Verifier
xssPolicy *security.XSSPolicy
}
// NewInquiryHandler creates a new inquiry handler
func NewHandler(service Service, logger logger.Logger, hcaptchaVerifier hcaptcha.Verifier) *Handler {
func NewHandler(service Service, logger logger.Logger, hcaptchaVerifier hcaptcha.Verifier, xssPolicy *security.XSSPolicy) *Handler {
return &Handler{
service: service,
logger: logger,
hcaptchaVerifier: hcaptchaVerifier,
xssPolicy: xssPolicy,
}
}
@@ -45,8 +47,8 @@ func (h *Handler) CreateInquiry(c echo.Context) error {
return response.BadRequest(c, "Invalid request format", "")
}
// Validate form
if _, err := govalidator.ValidateStruct(form); err != nil {
// Validate and sanitize form
if err := form.ValidateAndSanitize(h.xssPolicy); err != nil {
return response.ValidationError(c, err.Error(), "")
}
@@ -136,8 +138,8 @@ func (h *Handler) UpdateInquiryStatus(c echo.Context) error {
return response.BadRequest(c, "Invalid request format", "")
}
// Validate form
if _, err := govalidator.ValidateStruct(form); err != nil {
// Validate and sanitize form
if err := form.ValidateAndSanitize(h.xssPolicy); err != nil {
return response.ValidationError(c, err.Error(), "")
}
@@ -177,8 +179,8 @@ func (h *Handler) SearchInquiries(c echo.Context) error {
return response.BadRequest(c, "Invalid request format", "")
}
// Validate form
if _, err := govalidator.ValidateStruct(form); err != nil {
// Validate and sanitize form
if err := form.ValidateAndSanitize(h.xssPolicy); err != nil {
return response.ValidationError(c, err.Error(), "")
}
+6 -3
View File
@@ -7,6 +7,7 @@ import (
"tm/pkg/logger"
"tm/pkg/notification"
"tm/pkg/response"
"tm/pkg/security"
)
// Service defines business logic for inquiry operations
@@ -23,14 +24,16 @@ type inquiryService struct {
repository Repository
sdk notification.SDK
logger logger.Logger
xssPolicy *security.XSSPolicy
}
// NewService creates a new inquiry service
func NewService(repository Repository, sdk notification.SDK, logger logger.Logger) Service {
func NewService(repository Repository, sdk notification.SDK, logger logger.Logger, xssPolicy *security.XSSPolicy) Service {
return &inquiryService{
repository: repository,
sdk: sdk,
logger: logger,
xssPolicy: xssPolicy,
}
}
@@ -114,7 +117,7 @@ func (s *inquiryService) Create(ctx context.Context, form *CreateInquiryForm) (*
CompanyLogo: "",
CompanyURL: "https://opplens.com",
SupportEmail: "info@opplens.com",
}),
}, s.xssPolicy),
Type: "alert",
Priority: "important",
EventType: notification.EventTypeEmail,
@@ -137,7 +140,7 @@ func (s *inquiryService) Create(ctx context.Context, form *CreateInquiryForm) (*
CompanyLogo: "",
CompanyURL: "https://opplens.com",
SupportEmail: "info@opplens.com",
}),
}, s.xssPolicy),
Type: "alert",
Priority: "important",
EventType: notification.EventTypeEmail,