Compare commits
2 Commits
491f482fc7
...
082c75283d
Author | SHA1 | Date | |
---|---|---|---|
082c75283d | |||
9b31ff0bbb |
@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@ -103,6 +104,17 @@ func (app *application) GetWidgetByID(w http.ResponseWriter, r *http.Request) {
|
|||||||
w.Write(out)
|
w.Write(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Invoice struct {
|
||||||
|
ID int `json:"id"`
|
||||||
|
Quantity int `json:"quantity"`
|
||||||
|
Amount int `json:"amount"`
|
||||||
|
Product string `json:"product"`
|
||||||
|
FirstName string `json:"first_name"`
|
||||||
|
LastName string `json:"last_name"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
}
|
||||||
|
|
||||||
func (app *application) CreateCustomerAndSubscribeToPlan(w http.ResponseWriter, r *http.Request) {
|
func (app *application) CreateCustomerAndSubscribeToPlan(w http.ResponseWriter, r *http.Request) {
|
||||||
var data stripePayload
|
var data stripePayload
|
||||||
|
|
||||||
@ -183,11 +195,27 @@ func (app *application) CreateCustomerAndSubscribeToPlan(w http.ResponseWriter,
|
|||||||
Amount: amount,
|
Amount: amount,
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = app.SaveOrder(order)
|
orderID, err := app.SaveOrder(order)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.errorLog.Println(err)
|
app.errorLog.Println(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inv := Invoice{
|
||||||
|
ID: orderID,
|
||||||
|
Quantity: order.Quantity,
|
||||||
|
Amount: order.Amount,
|
||||||
|
Product: "Bronze Plan",
|
||||||
|
FirstName: data.FirstName,
|
||||||
|
LastName: data.LastName,
|
||||||
|
Email: data.Email,
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
}
|
||||||
|
err = app.callInvoiceMicro(inv)
|
||||||
|
if err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
// Don't stop the program
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resp := JSONResponse{
|
resp := JSONResponse{
|
||||||
@ -205,6 +233,30 @@ func (app *application) CreateCustomerAndSubscribeToPlan(w http.ResponseWriter,
|
|||||||
w.Write(out)
|
w.Write(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (app *application) callInvoiceMicro(inv Invoice) error {
|
||||||
|
// TODO: Do not hard code this.
|
||||||
|
url := "http://localhost:5000/invoice/create-and-send"
|
||||||
|
out, err := json.MarshalIndent(inv, "", "\t")
|
||||||
|
if err != err {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequest("POST", url, bytes.NewBuffer(out))
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
client := &http.Client{}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
app.infoLog.Println(resp.Body)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (app *application) SaveCustomer(firstName, lastName, email string) (int, error) {
|
func (app *application) SaveCustomer(firstName, lastName, email string) (int, error) {
|
||||||
customer := models.Customer{
|
customer := models.Customer{
|
||||||
FirstName: firstName,
|
FirstName: firstName,
|
||||||
|
18
cmd/micro/invoice/email-templates/invoice.html.gohtml
Normal file
18
cmd/micro/invoice/email-templates/invoice.html.gohtml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{{ define "body" }}
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta name="viewport" content="width=device-width">
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p>Hello:</p>
|
||||||
|
<p>Please find your invoice attached.</p>
|
||||||
|
<p>
|
||||||
|
--
|
||||||
|
<br>
|
||||||
|
Widget Co.
|
||||||
|
</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
{{ end }}
|
9
cmd/micro/invoice/email-templates/invoice.plain.gohtml
Normal file
9
cmd/micro/invoice/email-templates/invoice.plain.gohtml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{{ define "body" }}
|
||||||
|
Hello:
|
||||||
|
|
||||||
|
Please find your invoice attached.
|
||||||
|
|
||||||
|
--
|
||||||
|
Widget Co.
|
||||||
|
{{ end }}
|
||||||
|
|
@ -17,37 +17,38 @@ type Order struct {
|
|||||||
FirstName string `json:"first_name"`
|
FirstName string `json:"first_name"`
|
||||||
LastName string `json:"last_name"`
|
LastName string `json:"last_name"`
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
CreatedAt time.Time `json:"-"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *application) CreateAndSendInvoice(w http.ResponseWriter, r *http.Request) {
|
func (app *application) CreateAndSendInvoice(w http.ResponseWriter, r *http.Request) {
|
||||||
// receive json
|
// receive json
|
||||||
var order Order
|
var order Order
|
||||||
|
|
||||||
order.ID = 100
|
err := app.readJSON(w, r, &order)
|
||||||
order.Email = "me@here.com"
|
if err != nil {
|
||||||
order.FirstName = "John"
|
app.badRequest(w, r, err)
|
||||||
order.LastName = "Smith"
|
return
|
||||||
order.Quantity = 1
|
}
|
||||||
order.Amount = 1000
|
app.infoLog.Println(order)
|
||||||
order.Product = "Widget"
|
|
||||||
order.CreatedAt = time.Now()
|
|
||||||
// err = app.readJSON(w, r, &order)
|
|
||||||
// if err != nil {
|
|
||||||
// app.badRequest(w, r, err)
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
|
|
||||||
// generate a pdf invoice
|
// generate a pdf invoice
|
||||||
err := app.createInvoicePDF(order)
|
err = app.createInvoicePDF(order)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.badRequest(w, r, err)
|
app.badRequest(w, r, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// create mail
|
// create mail attachment
|
||||||
|
attachments := []string{
|
||||||
|
fmt.Sprintf("./invoices/%d.pdf", order.ID),
|
||||||
|
}
|
||||||
|
|
||||||
// send mail with attachment
|
// send mail with attachment
|
||||||
|
err = app.SendMail("info@widgets.com", order.Email, "Your invoice", "invoice", attachments, nil)
|
||||||
|
if err != nil {
|
||||||
|
app.badRequest(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// send response
|
// send response
|
||||||
var resp JSONResponse
|
var resp JSONResponse
|
||||||
|
@ -18,6 +18,6 @@ func (app *application) routes() http.Handler {
|
|||||||
MaxAge: 300,
|
MaxAge: 300,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
mux.Get("/invoice/create-and-send", app.CreateAndSendInvoice)
|
mux.Post("/invoice/create-and-send", app.CreateAndSendInvoice)
|
||||||
return mux
|
return mux
|
||||||
}
|
}
|
||||||
|
88
cmd/micro/invoice/mailer.go
Normal file
88
cmd/micro/invoice/mailer.go
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"embed"
|
||||||
|
"fmt"
|
||||||
|
"text/template"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
mail "github.com/xhit/go-simple-mail/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:embed email-templates
|
||||||
|
var emailTemplateFS embed.FS
|
||||||
|
|
||||||
|
func (app *application) SendMail(
|
||||||
|
from, to, subject, tmpl string,
|
||||||
|
attachments []string,
|
||||||
|
data interface{},
|
||||||
|
) error {
|
||||||
|
templateToRender := fmt.Sprintf("email-templates/%s.html.gohtml", tmpl)
|
||||||
|
|
||||||
|
t, err := template.New("email-html").ParseFS(emailTemplateFS, templateToRender)
|
||||||
|
if err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var tpl bytes.Buffer
|
||||||
|
if err = t.ExecuteTemplate(&tpl, "body", data); err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
formattedMessage := tpl.String()
|
||||||
|
|
||||||
|
templateToRender = fmt.Sprintf("email-templates/%s.plain.gohtml", tmpl)
|
||||||
|
t, err = template.New("email-plain").ParseFS(emailTemplateFS, templateToRender)
|
||||||
|
if err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err = t.ExecuteTemplate(&tpl, "body", data); err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
plainMessage := tpl.String()
|
||||||
|
|
||||||
|
app.infoLog.Println(formattedMessage, plainMessage)
|
||||||
|
|
||||||
|
// send the mail
|
||||||
|
server := mail.NewSMTPClient()
|
||||||
|
server.Host = app.config.smtp.host
|
||||||
|
server.Port = app.config.smtp.port
|
||||||
|
// NOTE: not needed for MailHog
|
||||||
|
// server.Username = app.config.smtp.username
|
||||||
|
// server.Password = app.config.smtp.password
|
||||||
|
// server.Encryption = mail.EncryptionTLS
|
||||||
|
server.KeepAlive = false
|
||||||
|
server.ConnectTimeout = 10 * time.Second
|
||||||
|
server.SendTimeout = 10 * time.Second
|
||||||
|
|
||||||
|
smtpClient, err := server.Connect()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
email := mail.NewMSG()
|
||||||
|
email.SetFrom(from).AddTo(to).SetSubject(subject)
|
||||||
|
email.SetBody(mail.TextHTML, formattedMessage)
|
||||||
|
email.AddAlternative(mail.TextPlain, plainMessage)
|
||||||
|
|
||||||
|
if len(attachments) > 0 {
|
||||||
|
for _, x := range attachments {
|
||||||
|
email.AddAttachment(x)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
err = email.Send(smtpClient)
|
||||||
|
if err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
app.infoLog.Println("send mail")
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
@ -1,6 +1,8 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"myapp/internal/cards"
|
"myapp/internal/cards"
|
||||||
"myapp/internal/cards/encryption"
|
"myapp/internal/cards/encryption"
|
||||||
@ -8,6 +10,7 @@ import (
|
|||||||
"myapp/internal/urlsigner"
|
"myapp/internal/urlsigner"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
)
|
)
|
||||||
@ -95,6 +98,17 @@ func (app *application) GetTransactionData(r *http.Request) (TransactionData, er
|
|||||||
return txnData, nil
|
return txnData, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Invoice struct {
|
||||||
|
ID int `json:"id"`
|
||||||
|
Quantity int `json:"quantity"`
|
||||||
|
Amount int `json:"amount"`
|
||||||
|
Product string `json:"product"`
|
||||||
|
FirstName string `json:"first_name"`
|
||||||
|
LastName string `json:"last_name"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
}
|
||||||
|
|
||||||
func (app *application) PaymentSucceeded(w http.ResponseWriter, r *http.Request) {
|
func (app *application) PaymentSucceeded(w http.ResponseWriter, r *http.Request) {
|
||||||
// read posted data
|
// read posted data
|
||||||
err := r.ParseForm()
|
err := r.ParseForm()
|
||||||
@ -150,6 +164,24 @@ func (app *application) PaymentSucceeded(w http.ResponseWriter, r *http.Request)
|
|||||||
app.errorLog.Println(err)
|
app.errorLog.Println(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// call microservice
|
||||||
|
inv := Invoice{
|
||||||
|
ID: orderID,
|
||||||
|
Quantity: order.Quantity,
|
||||||
|
Amount: order.Amount,
|
||||||
|
Product: "Widget",
|
||||||
|
FirstName: txnData.FirstName,
|
||||||
|
LastName: txnData.LastName,
|
||||||
|
Email: txnData.Email,
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
}
|
||||||
|
|
||||||
|
err = app.callInvoiceMicro(inv)
|
||||||
|
if err != nil {
|
||||||
|
app.errorLog.Println(err)
|
||||||
|
// Don't stop the program
|
||||||
|
}
|
||||||
|
|
||||||
app.infoLog.Printf("order id: %d", orderID)
|
app.infoLog.Printf("order id: %d", orderID)
|
||||||
|
|
||||||
app.Session.Put(r.Context(), "txn", txnData)
|
app.Session.Put(r.Context(), "txn", txnData)
|
||||||
@ -157,6 +189,30 @@ func (app *application) PaymentSucceeded(w http.ResponseWriter, r *http.Request)
|
|||||||
http.Redirect(w, r, "/receipt", http.StatusSeeOther)
|
http.Redirect(w, r, "/receipt", http.StatusSeeOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (app *application) callInvoiceMicro(inv Invoice) error {
|
||||||
|
// TODO: Do not hard code this.
|
||||||
|
url := "http://localhost:5000/invoice/create-and-send"
|
||||||
|
out, err := json.MarshalIndent(inv, "", "\t")
|
||||||
|
if err != err {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequest("POST", url, bytes.NewBuffer(out))
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
client := &http.Client{}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
app.infoLog.Println(resp.Body)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (app *application) VirtualTerminalPaymentSucceeded(w http.ResponseWriter, r *http.Request) {
|
func (app *application) VirtualTerminalPaymentSucceeded(w http.ResponseWriter, r *http.Request) {
|
||||||
txnData, err := app.GetTransactionData(r)
|
txnData, err := app.GetTransactionData(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user