Skip to content

Commit

Permalink
Merge branch 'release/v0.0.85'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lmquang
lmquang committed Apr 12, 2023
2 parents 6e368e5 + be49bea commit bb8e742
Show file tree
Hide file tree
Showing 41 changed files with 1,825 additions and 443 deletions.
18 changes: 18 additions & 0 deletions migrations/schemas/20230410074637-create_service_table.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

-- +migrate Up
CREATE TABLE IF NOT EXISTS public.operational_services (
id uuid PRIMARY KEY DEFAULT (uuid()),
created_at TIMESTAMP(6) DEFAULT NOW(),
update_at TIMESTAMP(6) DEFAULT NOW(),
deleted_at TIMESTAMP(6),
name TEXT,
amount INT8,
currency_id UUID REFERENCES public.currencies (id),
note TEXT,
register_date DATE DEFAULT NOW(),
start_at DATE DEFAULT NOW(),
end_at DATE,
is_active BOOLEAN DEFAULT TRUE
);
-- +migrate Down
DROP TABLE public.operational_services;
6 changes: 5 additions & 1 deletion pkg/controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,25 @@ import (
"github.com/dwarvesf/fortress-api/pkg/controller/auth"
"github.com/dwarvesf/fortress-api/pkg/controller/client"
"github.com/dwarvesf/fortress-api/pkg/controller/employee"
"github.com/dwarvesf/fortress-api/pkg/controller/invoice"
"github.com/dwarvesf/fortress-api/pkg/logger"
"github.com/dwarvesf/fortress-api/pkg/service"
"github.com/dwarvesf/fortress-api/pkg/store"
"github.com/dwarvesf/fortress-api/pkg/worker"
)

type Controller struct {
Auth auth.IController
Client client.IController
Employee employee.IController
Invoice invoice.IController
}

func New(store *store.Store, repo store.DBRepo, service *service.Service, logger logger.Logger, cfg *config.Config) *Controller {
func New(store *store.Store, repo store.DBRepo, service *service.Service, worker *worker.Worker, logger logger.Logger, cfg *config.Config) *Controller {
return &Controller{
Auth: auth.New(store, repo, service, logger, cfg),
Client: client.New(store, repo, service, logger, cfg),
Employee: employee.New(store, repo, service, logger, cfg),
Invoice: invoice.New(store, repo, service, worker, logger, cfg),
}
}
42 changes: 21 additions & 21 deletions pkg/handler/invoice/invoice_commission.go → pkg/controller/invoice/commission.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ type pics struct {
upsells []pic
}

func (h *handler) storeCommission(db *gorm.DB, l logger.Logger, invoice *model.Invoice) ([]model.EmployeeCommission, error) {
func (c *controller) storeCommission(db *gorm.DB, l logger.Logger, invoice *model.Invoice) ([]model.EmployeeCommission, error) {
if invoice.Project.Type != model.ProjectTypeTimeMaterial {
return nil, nil
}
employeeCommissions, err := h.calculateCommissionFromInvoice(db, l, invoice)
employeeCommissions, err := c.calculateCommissionFromInvoice(db, l, invoice)
if err != nil {
l.Errorf(err, "failed to create commission", "invoice", invoice)
return nil, err
}

return h.store.EmployeeCommission.Create(db, employeeCommissions)
return c.store.EmployeeCommission.Create(db, employeeCommissions)
}

func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, invoice *model.Invoice) ([]model.EmployeeCommission, error) {
func (c *controller) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, invoice *model.Invoice) ([]model.EmployeeCommission, error) {
// Get project commission configs
commissionConfigs, err := h.store.ProjectCommissionConfig.GetByProjectID(db, invoice.ProjectID.String())
commissionConfigs, err := c.store.ProjectCommissionConfig.GetByProjectID(db, invoice.ProjectID.String())
if err != nil {
l.Errorf(err, "failed to get project commission config", "projectID", invoice.ProjectID.String())
return nil, err
}
commissionConfigMap := commissionConfigs.ToMap()

projectMembers, err := h.store.ProjectMember.GetAssignedMembers(db, invoice.ProjectID.String(), model.ProjectMemberStatusActive.String(), true)
projectMembers, err := c.store.ProjectMember.GetAssignedMembers(db, invoice.ProjectID.String(), model.ProjectMemberStatusActive.String(), true)
if err != nil {
l.Errorf(err, "failed to calculate account manager commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand All @@ -66,7 +66,7 @@ func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, i
if len(pics.devLeads) > 0 {
commissionRate := commissionConfigMap[model.HeadPositionTechnicalLead.String()]
if commissionRate.GreaterThan(decimal.NewFromInt(0)) {
c, err := h.calculateHeadCommission(commissionRate, pics.devLeads, invoice, float64(invoice.Total))
c, err := c.calculateHeadCommission(commissionRate, pics.devLeads, invoice, float64(invoice.Total))
if err != nil {
l.Errorf(err, "failed to calculate dev lead commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand All @@ -78,7 +78,7 @@ func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, i
if len(pics.accountManagers) > 0 {
commissionRate := commissionConfigMap[model.HeadPositionAccountManager.String()]
if commissionRate.GreaterThan(decimal.NewFromInt(0)) {
c, err := h.calculateHeadCommission(commissionRate, pics.accountManagers, invoice, float64(invoice.Total))
c, err := c.calculateHeadCommission(commissionRate, pics.accountManagers, invoice, float64(invoice.Total))
if err != nil {
l.Errorf(err, "failed to calculate account manager commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand All @@ -90,7 +90,7 @@ func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, i
if len(pics.deliveryManagers) > 0 {
commissionRate := commissionConfigMap[model.HeadPositionDeliveryManager.String()]
if commissionRate.GreaterThan(decimal.NewFromInt(0)) {
c, err := h.calculateHeadCommission(commissionRate, pics.deliveryManagers, invoice, float64(invoice.Total))
c, err := c.calculateHeadCommission(commissionRate, pics.deliveryManagers, invoice, float64(invoice.Total))
if err != nil {
l.Errorf(err, "failed to calculate delivery manager commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand All @@ -102,7 +102,7 @@ func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, i
if len(pics.sales) > 0 {
commissionRate := commissionConfigMap[model.HeadPositionSalePerson.String()]
if commissionRate.GreaterThan(decimal.NewFromInt(0)) {
c, err := h.calculateHeadCommission(commissionRate, pics.sales, invoice, float64(invoice.Total))
c, err := c.calculateHeadCommission(commissionRate, pics.sales, invoice, float64(invoice.Total))
if err != nil {
l.Errorf(err, "failed to calculate account manager commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand All @@ -112,7 +112,7 @@ func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, i
}

if len(pics.upsells) > 0 {
c, err := h.calculateRefBonusCommission(pics.upsells, invoice)
c, err := c.calculateRefBonusCommission(pics.upsells, invoice)
if err != nil {
l.Errorf(err, "failed to calculate account manager commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand All @@ -121,7 +121,7 @@ func (h *handler) calculateCommissionFromInvoice(db *gorm.DB, l logger.Logger, i
}

if len(pics.suppliers) > 0 {
c, err := h.calculateRefBonusCommission(pics.suppliers, invoice)
c, err := c.calculateRefBonusCommission(pics.suppliers, invoice)
if err != nil {
l.Errorf(err, "failed to calculate account manager commission rate", "projectID", invoice.ProjectID.String())
return nil, err
Expand Down Expand Up @@ -209,27 +209,27 @@ func getPICs(invoice *model.Invoice, projectMembers []*model.ProjectMember) *pic
}
}

func (h *handler) movePaidInvoiceGDrive(l logger.Logger, wg *sync.WaitGroup, req *processPaidInvoiceRequest) {
msg := h.service.Basecamp.BuildCommentMessage(req.InvoiceBucketID, req.InvoiceTodoID, bcConst.CommentMoveInvoicePDFToPaidDirSuccessfully, bcModel.CommentMsgTypeCompleted)
func (c *controller) movePaidInvoiceGDrive(l logger.Logger, wg *sync.WaitGroup, req *processPaidInvoiceRequest) {
msg := c.service.Basecamp.BuildCommentMessage(req.InvoiceBucketID, req.InvoiceTodoID, bcConst.CommentMoveInvoicePDFToPaidDirSuccessfully, bcModel.CommentMsgTypeCompleted)

defer func() {
h.worker.Enqueue(bcModel.BasecampCommentMsg, msg)
c.worker.Enqueue(bcModel.BasecampCommentMsg, msg)
wg.Done()
}()

err := h.service.GoogleDrive.MoveInvoicePDF(req.Invoice, "Sent", "Paid")
err := c.service.GoogleDrive.MoveInvoicePDF(req.Invoice, "Sent", "Paid")
if err != nil {
l.Errorf(err, "failed to move invoice pdf from sent to paid folder", "invoice", req.Invoice)
msg = h.service.Basecamp.BuildCommentMessage(req.InvoiceBucketID, req.InvoiceTodoID, bcConst.CommentMoveInvoicePDFToPaidDirFailed, bcModel.CommentMsgTypeFailed)
msg = c.service.Basecamp.BuildCommentMessage(req.InvoiceBucketID, req.InvoiceTodoID, bcConst.CommentMoveInvoicePDFToPaidDirFailed, bcModel.CommentMsgTypeFailed)
return
}
}

func (h *handler) calculateHeadCommission(projectCommissionRate decimal.Decimal, beneficiaries []pic, invoice *model.Invoice, invoiceTotalPrice float64) ([]model.EmployeeCommission, error) {
func (c *controller) calculateHeadCommission(projectCommissionRate decimal.Decimal, beneficiaries []pic, invoice *model.Invoice, invoiceTotalPrice float64) ([]model.EmployeeCommission, error) {
// conversionRate by percentage
pcrPercentage := projectCommissionRate.Div(decimal.NewFromInt(100))
projectCommissionValue, _ := pcrPercentage.Mul(decimal.NewFromFloat(invoiceTotalPrice)).Float64()
convertedValue, rate, err := h.service.Wise.Convert(projectCommissionValue, invoice.Project.BankAccount.Currency.Name, "VND")
convertedValue, rate, err := c.service.Wise.Convert(projectCommissionValue, invoice.Project.BankAccount.Currency.Name, "VND")
if err != nil {
return nil, err
}
Expand All @@ -255,13 +255,13 @@ func (h *handler) calculateHeadCommission(projectCommissionRate decimal.Decimal,
return rs, nil
}

func (h *handler) calculateRefBonusCommission(pics []pic, invoice *model.Invoice) ([]model.EmployeeCommission, error) {
func (c *controller) calculateRefBonusCommission(pics []pic, invoice *model.Invoice) ([]model.EmployeeCommission, error) {
// conversionRate by percentage
var rs []model.EmployeeCommission
for _, pic := range pics {
percentage := pic.CommissionRate.Div(decimal.NewFromInt(100))
commissionValue, _ := percentage.Mul(decimal.NewFromFloat(pic.ChargeRate)).Float64()
convertedValue, rate, err := h.service.Wise.Convert(commissionValue, invoice.Project.BankAccount.Currency.Name, "VND")
convertedValue, rate, err := c.service.Wise.Convert(commissionValue, invoice.Project.BankAccount.Currency.Name, "VND")
if err != nil {
return nil, err
}
Expand Down
8 changes: 8 additions & 0 deletions pkg/controller/invoice/errors.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package invoice

import "errors"

var (
ErrInvoiceNotFound = errors.New("invoice not found")
ErrInvoiceStatusAlready = errors.New("invoice status already")
)
36 changes: 36 additions & 0 deletions pkg/controller/invoice/new.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package invoice

import (
"github.com/dwarvesf/fortress-api/pkg/config"
"github.com/dwarvesf/fortress-api/pkg/logger"
"github.com/dwarvesf/fortress-api/pkg/model"
"github.com/dwarvesf/fortress-api/pkg/service"
"github.com/dwarvesf/fortress-api/pkg/store"
"github.com/dwarvesf/fortress-api/pkg/worker"
)

type controller struct {
store *store.Store
service *service.Service
worker *worker.Worker
logger logger.Logger
repo store.DBRepo
config *config.Config
}

func New(store *store.Store, repo store.DBRepo, service *service.Service, worker *worker.Worker, logger logger.Logger, cfg *config.Config) IController {
return &controller{
store: store,
repo: repo,
service: service,
logger: logger,
config: cfg,
worker: worker,
}
}

type IController interface {
UpdateStatus(in UpdateStatusInput) (*model.Invoice, error)
MarkInvoiceAsError(invoice *model.Invoice) (*model.Invoice, error)
MarkInvoiceAsPaid(invoice *model.Invoice, sendThankYouEmail bool) (*model.Invoice, error)
}
Loading

0 comments on commit bb8e742

Please sign in to comment.