apksel-dev/apskel-pos-backend
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: apksel-dev:main
Branches Tags
apksel-dev:main
apksel-dev:feature/expense
apksel-dev:feature/activity-logs
apksel-dev:feature/print-checker
apksel-dev:feature/purchasing
apksel-dev:feature/outlet-table
apksel-dev:feature/outletid
apksel-dev:self-order+notification
apksel-dev:feature/notification
apksel-dev:enaklo-self-order
apksel-dev:feature/ingredient-composition
apksel-dev:hpp
apksel-dev:dev
..
compare: apksel-dev:feature/activity-logs
Branches Tags
apksel-dev:feature/expense
apksel-dev:main
apksel-dev:feature/activity-logs
apksel-dev:feature/print-checker
apksel-dev:feature/purchasing
apksel-dev:feature/outlet-table
apksel-dev:feature/outletid
apksel-dev:self-order+notification
apksel-dev:feature/notification
apksel-dev:enaklo-self-order
apksel-dev:feature/ingredient-composition
apksel-dev:hpp
apksel-dev:dev

No commits in common. "main" and "feature/activity-logs" have entirely different histories.
main ... feature/ac

6 changed files with 1 additions and 8 deletions
Show Stats Expand all files Collapse all files

1
internal/contract/analytics_contract.go
View File

@ -162,7 +162,6 @@ type ProductAnalyticsData struct {
ProductID uuid.UUID `json:"product_id"` ProductID uuid.UUID `json:"product_id"`
ProductName string `json:"product_name"` ProductName string `json:"product_name"`
ProductSku string `json:"product_sku"` ProductSku string `json:"product_sku"`
ProductPrice float64 `json:"product_price"`
CategoryID uuid.UUID `json:"category_id"` CategoryID uuid.UUID `json:"category_id"`
CategoryName string `json:"category_name"` CategoryName string `json:"category_name"`
CategoryOrder int `json:"category_order"` CategoryOrder int `json:"category_order"`

1
internal/entities/analytics.go
View File

@ -76,7 +76,6 @@ type ProductAnalytics struct {
ProductID uuid.UUID `json:"product_id"` ProductID uuid.UUID `json:"product_id"`
ProductName string `json:"product_name"` ProductName string `json:"product_name"`
ProductSku string `json:"product_sku"` ProductSku string `json:"product_sku"`
ProductPrice float64 `json:"product_price"`
CategoryID uuid.UUID `json:"category_id"` CategoryID uuid.UUID `json:"category_id"`
CategoryName string `json:"category_name"` CategoryName string `json:"category_name"`
CategoryOrder int `json:"category_order"` CategoryOrder int `json:"category_order"`

1
internal/models/analytics.go
View File

@ -172,7 +172,6 @@ type ProductAnalyticsData struct {
ProductID uuid.UUID `json:"product_id"` ProductID uuid.UUID `json:"product_id"`
ProductName string `json:"product_name"` ProductName string `json:"product_name"`
ProductSku string `json:"product_sku"` ProductSku string `json:"product_sku"`
ProductPrice float64 `json:"product_price"`
CategoryID uuid.UUID `json:"category_id"` CategoryID uuid.UUID `json:"category_id"`
CategoryName string `json:"category_name"` CategoryName string `json:"category_name"`
CategoryOrder int `json:"category_order"` CategoryOrder int `json:"category_order"`

1
internal/processor/analytics_processor.go
View File

@ -264,7 +264,6 @@ func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *m
ProductID: data.ProductID, ProductID: data.ProductID,
ProductName: data.ProductName, ProductName: data.ProductName,
ProductSku: data.ProductSku, ProductSku: data.ProductSku,
ProductPrice: data.ProductPrice,
CategoryID: data.CategoryID, CategoryID: data.CategoryID,
CategoryName: data.CategoryName, CategoryName: data.CategoryName,
CategoryOrder: data.CategoryOrder, CategoryOrder: data.CategoryOrder,

3
internal/repository/analytics_repository.go
View File

@ -284,7 +284,6 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
Select(` Select(`
p.id as product_id, p.id as product_id,
p.name as product_name, p.name as product_name,
p.price as product_price,
c.id as category_id, c.id as category_id,
c.name as category_name, c.name as category_name,
c.order as category_order, c.order as category_order,
@ -343,7 +342,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
query = r.resolveOutletID(query, outletID, "o.outlet_id") query = r.resolveOutletID(query, outletID, "o.outlet_id")
err := query. err := query.
Group("p.id, p.name, p.price, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit"). Group("p.id, p.name, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
Order("revenue DESC"). Order("revenue DESC").
Limit(limit). Limit(limit).
Scan(&results).Error Scan(&results).Error

2
internal/transformer/analytics_transformer.go
View File

@ -257,7 +257,6 @@ func ProductAnalyticsModelToContract(resp *models.ProductAnalyticsResponse) *con
ProductID: item.ProductID, ProductID: item.ProductID,
ProductName: item.ProductName, ProductName: item.ProductName,
ProductSku: item.ProductSku, ProductSku: item.ProductSku,
ProductPrice: item.ProductPrice,
CategoryID: item.CategoryID, CategoryID: item.CategoryID,
CategoryName: item.CategoryName, CategoryName: item.CategoryName,
CategoryOrder: item.CategoryOrder, CategoryOrder: item.CategoryOrder,
@ -368,7 +367,6 @@ func DashboardAnalyticsModelToContract(resp *models.DashboardAnalyticsResponse)
topProducts = append(topProducts, contract.ProductAnalyticsData{ topProducts = append(topProducts, contract.ProductAnalyticsData{
ProductID: item.ProductID, ProductID: item.ProductID,
ProductName: item.ProductName, ProductName: item.ProductName,
ProductPrice: item.ProductPrice,
CategoryID: item.CategoryID, CategoryID: item.CategoryID,
CategoryName: item.CategoryName, CategoryName: item.CategoryName,
QuantitySold: item.QuantitySold, QuantitySold: item.QuantitySold,