munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust vehicle hist

Browse Source
This commit is contained in:
vanilia
2025-10-20 10:28:23 +07:00
parent d05ba1d2ca
commit 71cb7d621d
13 changed files with 512 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/vehicle-hist/dto.go
+64
View File
@@ -0,0 +1,64 @@
package vehicle_hist
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ev "simrs-vx/internal/domain/main-entities/vehicle"
ercm "simrs-vx/internal/domain/references/common"
"time"
)
type CreateDto struct {
Vehicle ev.Vehicle
Crud_Code ercm.CrudCode `json:"crud_code"`
}
type ReadListDto struct {
FilterDto
Includes string `json:"includes"`
Pagination ecore.Pagination
}
type FilterDto struct {
Vehicle_Id *uint `json:"vehicle-id"`
Crud_Code ercm.CrudCode `json:"crud_code"`
}
type ReadDetailDto struct {
Id uint16 `json:"id"`
Includes string `json:"includes"`
}
type MetaDto struct {
PageNumber int `json:"page_number"`
PageSize int `json:"page_size"`
Count int `json:"count"`
}
type ResponseDto struct {
ecore.Main
Vehicle_Id *uint `json:"vehicle_id"`
Vehicle *ev.Vehicle `json:"vehicle,omitempty" gorm:"foreignKey:Vehicle_Id;references:Id"`
Date *time.Time `json:"date"`
Data *string `json:"data"`
Crud_Code *ercm.CrudCode `json:"crud_code"`
}
func (d VehicleHist) ToResponse() ResponseDto {
resp := ResponseDto{
Vehicle_Id: d.Vehicle_Id,
Vehicle: d.Vehicle,
Date: d.Date,
Data: d.Data,
Crud_Code: d.Crud_Code,
}
resp.Main = d.Main
return resp
}
func ToResponseList(data []VehicleHist) []ResponseDto {
resp := make([]ResponseDto, len(data))
for i, u := range data {
resp[i] = u.ToResponse()
}
return resp
}
internal/domain/main-entities/vehicle/dto.go
-6
View File
@@ -3,7 +3,6 @@ package vehicle
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ercl "simrs-vx/internal/domain/references/clinical"
ercm "simrs-vx/internal/domain/references/common"
)
type CreateDto struct {
@@ -14,11 +13,6 @@ type CreateDto struct {
AvailableStatus bool `json:"availableStatus"`
}
type InsertVehicleHist struct {
Vehicle
Crud_Code ercm.CrudCode `json:"crud_code"`
}
type ReadListDto struct {
FilterDto
Includes string `json:"includes"`
internal/interface/main-handler/main-handler.go
+2
View File
@@ -88,6 +88,7 @@ import (
unit "simrs-vx/internal/interface/main-handler/unit"
uom "simrs-vx/internal/interface/main-handler/uom"
vehicle "simrs-vx/internal/interface/main-handler/vehicle"
vehiclehist "simrs-vx/internal/interface/main-handler/vehicle-hist"
district "simrs-vx/internal/interface/main-handler/district"
postalregion "simrs-vx/internal/interface/main-handler/postal-region"
@@ -299,6 +300,7 @@ func SetRoutes() http.Handler {
hc.RegCrud(r, "/v1/subspecialist", subspecialist.O)
hc.RegCrud(r, "/v1/mcu-sub-src", mcusubsrc.O)
hc.RegCrud(r, "/v1/vehicle", vehicle.O)
hc.RegCrud(r, "/v1/vehicle-hist", vehiclehist.O)
hc.RegCrud(r, "/v1/village", village.O)
hc.RegCrud(r, "/v1/district", district.O)
internal/interface/main-handler/vehicle-hist/handler.go
+42
View File
@@ -0,0 +1,42 @@
package vehiclehist
import (
"net/http"
e "simrs-vx/internal/domain/main-entities/vehicle-hist"
u "simrs-vx/internal/use-case/main-use-case/vehicle-hist"
rw "github.com/karincake/risoles"
sf "github.com/karincake/semprit"
)
type myBase struct{}
var O myBase
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {}
func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) {
dto := e.ReadListDto{}
sf.UrlQueryParam(&dto, *r.URL)
res, err := u.ReadList(dto)
rw.DataResponse(w, res, err)
}
func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
id := rw.ValidateInt(w, "id", r.PathValue("id"))
if id <= 0 {
return
}
dto := e.ReadDetailDto{}
sf.UrlQueryParam(&dto, *r.URL)
dto.Id = uint16(id)
res, err := u.ReadDetail(dto)
rw.DataResponse(w, res, err)
}
func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {}
func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {}
internal/use-case/main-use-case/vehicle-hist/case.go
+116
View File
@@ -0,0 +1,116 @@
package vehiclehist
import (
"strconv"
"gorm.io/gorm"
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
dg "github.com/karincake/apem/db-gorm-pg"
d "github.com/karincake/dodol"
)
const source = "vehicle-hist"
func ReadList(input vh.ReadListDto) (*d.Data, error) {
var data *vh.VehicleHist
var dataList []vh.VehicleHist
var metaList *vh.MetaDto
var err error
event := pl.Event{
Feature: "ReadList",
Source: source,
}
// Start log
pl.SetLogInfo(&event, input, "started", "readList")
err = dg.I.Transaction(func(tx *gorm.DB) error {
mwRunner := newMiddlewareRunner(&event, tx)
mwRunner.setMwType(pu.MWTPre)
// Run pre-middleware
if err := mwRunner.RunReadListMiddleware(readListPreMw, &input, data); err != nil {
return err
}
if dataList, metaList, err = ReadListData(input, &event, tx); err != nil {
return err
}
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil {
return err
}
return nil
})
if err != nil {
return nil, err
}
return &d.Data{
Meta: d.IS{
"source": source,
"structure": "list-data",
"status": "fetched",
"page_number": strconv.Itoa(metaList.PageNumber),
"page_size": strconv.Itoa(metaList.PageSize),
"record_totalCount": strconv.Itoa(metaList.Count),
"record_currentCount": strconv.Itoa(len(dataList)),
},
Data: vh.ToResponseList(dataList),
}, nil
}
func ReadDetail(input vh.ReadDetailDto) (*d.Data, error) {
var data *vh.VehicleHist
var err error
event := pl.Event{
Feature: "ReadDetail",
Source: source,
}
// Start log
pl.SetLogInfo(&event, input, "started", "readDetail")
err = dg.I.Transaction(func(tx *gorm.DB) error {
mwRunner := newMiddlewareRunner(&event, tx)
mwRunner.setMwType(pu.MWTPre)
// Run pre-middleware
if err := mwRunner.RunReadDetailMiddleware(readDetailPreMw, &input, data); err != nil {
return err
}
if data, err = ReadDetailData(input, &event, tx); err != nil {
return err
}
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil {
return err
}
return nil
})
if err != nil {
return nil, err
}
return &d.Data{
Meta: d.IS{
"source": source,
"structure": "single-data",
"status": "fetched",
},
Data: data.ToResponse(),
}, nil
}
internal/use-case/main-use-case/vehicle-hist/helper.go
+25
View File
@@ -0,0 +1,25 @@
/*
DESCRIPTION:
Any functions that are used internally by the use-case
*/
package vehiclehist
import (
"encoding/json"
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
"time"
)
func setData(input vh.CreateDto, data *vh.VehicleHist) {
now := time.Now()
data.Vehicle_Id = &input.Vehicle.Id
data.Date = &now
data.Data = toStringPtr(input.Vehicle)
data.Crud_Code = &input.Crud_Code
}
func toStringPtr(v any) *string {
b, _ := json.Marshal(v)
s := string(b)
return &s
}
internal/use-case/main-use-case/vehicle-hist/lib.go
+96
View File
@@ -0,0 +1,96 @@
package vehiclehist
import (
"errors"
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
pu "simrs-vx/pkg/use-case-helper"
plh "simrs-vx/pkg/lib-helper"
pl "simrs-vx/pkg/logger"
dg "github.com/karincake/apem/db-gorm-pg"
gh "github.com/karincake/getuk"
"gorm.io/gorm"
)
func CreateData(input vh.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*vh.VehicleHist, error) {
pl.SetLogInfo(event, nil, "started", "DBCreate")
data := vh.VehicleHist{}
setData(input, &data)
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
} else {
tx = dg.I
}
if err := tx.Create(&data).Error; err != nil {
return nil, plh.HandleCreateError(input, event, err)
}
pl.SetLogInfo(event, nil, "complete")
return &data, nil
}
func ReadListData(input vh.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]vh.VehicleHist, *vh.MetaDto, error) {
pl.SetLogInfo(event, input, "started", "DBReadList")
data := []vh.VehicleHist{}
pagination := gh.Pagination{}
count := int64(0)
meta := vh.MetaDto{}
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
} else {
tx = dg.I
}
tx = tx.
Model(&vh.VehicleHist{}).
Scopes(gh.Preload(input.Includes)).
Scopes(gh.Filter(input.FilterDto)).
Count(&count).
Scopes(gh.Paginate(input, &pagination)).
Order("\"CreatedAt\" DESC")
if err := tx.Find(&data).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, &meta, nil
}
return nil, nil, plh.HandleListError(input, event, err)
}
meta.Count = int(count)
meta.PageNumber = pagination.PageNumber
meta.PageSize = pagination.PageSize
pl.SetLogInfo(event, nil, "complete")
return data, &meta, nil
}
func ReadDetailData(input vh.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*vh.VehicleHist, error) {
pl.SetLogInfo(event, input, "started", "DBReadDetail")
data := vh.VehicleHist{}
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
} else {
tx = dg.I
}
if err := tx.
Scopes(gh.Preload(input.Includes)).
First(&data, input.Id).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
}
pl.SetLogInfo(event, nil, "complete")
return &data, nil
}
internal/use-case/main-use-case/vehicle-hist/middleware-runner.go
+103
View File
@@ -0,0 +1,103 @@
package vehiclehist
import (
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
"gorm.io/gorm"
)
type middlewareRunner struct {
Event *pl.Event
Tx *gorm.DB
MwType pu.MWType
}
// NewMiddlewareExecutor creates a new middleware executor
func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
return &middlewareRunner{
Event: event,
Tx: tx,
}
}
// ExecuteCreateMiddleware executes create middleware
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *vh.CreateDto, data *vh.VehicleHist) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *vh.ReadListDto, data *vh.VehicleHist) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *vh.ReadDetailDto, data *vh.VehicleHist) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *vh.ReadDetailDto, data *vh.VehicleHist) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *vh.ReadDetailDto, data *vh.VehicleHist) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) setMwType(mwType pu.MWType) {
me.MwType = mwType
}
internal/use-case/main-use-case/vehicle-hist/middleware.go
+9
View File
@@ -0,0 +1,9 @@
package vehiclehist
// example of middleware
// func init() {
// createPreMw = append(createPreMw,
// CreateMw{Name: "modif-input", Func: pm.ModifInput},
// CreateMw{Name: "check-data", Func: pm.CheckData},
// )
// }
internal/use-case/main-use-case/vehicle-hist/tycovar.go
+44
View File
@@ -0,0 +1,44 @@
/*
DESCRIPTION:
A sample, part of the package that contains type, constants, and/or variables.
In this sample it also provides type and variable regarding the needs of the
middleware to separate from main use-case which has the basic CRUD
functionality. The purpose of this is to make the code more maintainable.
*/
package vehiclehist
import (
"gorm.io/gorm"
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
)
type createMw struct {
Name string
Func func(input *vh.CreateDto, data *vh.VehicleHist, tx *gorm.DB) error
}
type readListMw struct {
Name string
Func func(input *vh.ReadListDto, data *vh.VehicleHist, tx *gorm.DB) error
}
type readDetailMw struct {
Name string
Func func(input *vh.ReadDetailDto, data *vh.VehicleHist, tx *gorm.DB) error
}
type UpdateMw = readDetailMw
type DeleteMw = readDetailMw
var createPreMw []createMw // preprocess middleware
var createPostMw []createMw // postprocess middleware
var readListPreMw []readListMw // ..
var readListPostMw []readListMw // ..
var readDetailPreMw []readDetailMw
var readDetailPostMw []readDetailMw
var updatePreMw []readDetailMw
var updatePostMw []readDetailMw
var deletePreMw []readDetailMw
var deletePostMw []readDetailMw
internal/use-case/main-use-case/vehicle/case.go
+11 -8
View File
@@ -10,6 +10,9 @@ import (
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
evh "simrs-vx/internal/domain/main-entities/vehicle-hist"
uvh "simrs-vx/internal/use-case/main-use-case/vehicle-hist"
dg "github.com/karincake/apem/db-gorm-pg"
d "github.com/karincake/dodol"
)
@@ -48,13 +51,13 @@ func Create(input v.CreateDto) (*d.Data, error) {
}
// Set data for vehicle hist
vehicleHistData := v.InsertVehicleHist{
vehicleHistData := evh.CreateDto{
Crud_Code: rcm.CCCreate,
Vehicle: data,
}
// Insert Vehicle Hist
if err := InsertVehicleHist(vehicleHistData, &event, tx); err != nil {
if _, err := uvh.CreateData(vehicleHistData, &event, tx); err != nil {
return err
}
@@ -161,13 +164,13 @@ func ReadDetail(input v.ReadDetailDto) (*d.Data, error) {
}
// Set data for vehicle hist
vehicleHistData := v.InsertVehicleHist{
vehicleHistData := evh.CreateDto{
Crud_Code: rcm.CCRead,
Vehicle: *data,
}
// Insert Vehicle Hist
if err := InsertVehicleHist(vehicleHistData, &event, tx); err != nil {
if _, err := uvh.CreateData(vehicleHistData, &event, tx); err != nil {
return err
}
@@ -231,13 +234,13 @@ func Update(input v.UpdateDto) (*d.Data, error) {
}
// Set data for vehicle hist
vehicleHistData := v.InsertVehicleHist{
vehicleHistData := evh.CreateDto{
Crud_Code: rcm.CCUpdate,
Vehicle: *data,
}
// Insert Vehicle Hist
if err := InsertVehicleHist(vehicleHistData, &event, tx); err != nil {
if _, err := uvh.CreateData(vehicleHistData, &event, tx); err != nil {
return err
}
@@ -299,13 +302,13 @@ func Delete(input v.DeleteDto) (*d.Data, error) {
}
// Set data for vehicle hist
vehicleHistData := v.InsertVehicleHist{
vehicleHistData := evh.CreateDto{
Crud_Code: rcm.CCDelete,
Vehicle: *data,
}
// Insert Vehicle Hist
if err := InsertVehicleHist(vehicleHistData, &event, tx); err != nil {
if _, err := uvh.CreateData(vehicleHistData, &event, tx); err != nil {
return err
}
internal/use-case/main-use-case/vehicle/helper.go
-30
View File
@@ -5,14 +5,10 @@ Any functions that are used internally by the use-case
package vehicle
import (
"encoding/json"
"errors"
v "simrs-vx/internal/domain/main-entities/vehicle"
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
rcl "simrs-vx/internal/domain/references/clinical"
pl "simrs-vx/pkg/logger"
"time"
)
func setData[T *v.CreateDto | *v.UpdateDto](input T, data *v.Vehicle) {
@@ -31,38 +27,12 @@ func setData[T *v.CreateDto | *v.UpdateDto](input T, data *v.Vehicle) {
data.AvailableStatus = inputSrc.AvailableStatus
}
func setDataVehicleHist(input v.InsertVehicleHist, data *vh.VehicleHist) {
now := time.Now()
data.Vehicle_Id = &input.Id
data.Date = &now
data.Data = toStringPtr(input.Vehicle)
data.Crud_Code = &input.Crud_Code
}
func toStringPtr(v any) *string {
b, _ := json.Marshal(v)
s := string(b)
return &s
}
func validateRequest(input v.CreateDto, event *pl.Event) error {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-validation-fail",
}
if input.Type_Code == "" {
event.ErrInfo.Detail = "Field 'type_code' is required"
event.ErrInfo.Raw = errors.New("type_code is required")
return pl.SetLogError(event, input)
}
if input.PoliceNumber == nil {
event.ErrInfo.Detail = "Field 'policeNumber' is required"
event.ErrInfo.Raw = errors.New("policeNumber is required")
return pl.SetLogError(event, input)
}
switch input.Type_Code {
case rcl.VTCAmbulance, rcl.VTCTransport, rcl.VTCHearse:
return nil
internal/use-case/main-use-case/vehicle/lib.go
-22
View File
@@ -3,7 +3,6 @@ package vehicle
import (
"errors"
v "simrs-vx/internal/domain/main-entities/vehicle"
vh "simrs-vx/internal/domain/main-entities/vehicle-hist"
pu "simrs-vx/pkg/use-case-helper"
plh "simrs-vx/pkg/lib-helper"
@@ -35,27 +34,6 @@ func CreateData(input v.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*v.Vehicle
return &data, nil
}
func InsertVehicleHist(input v.InsertVehicleHist, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, nil, "started", "DBCreate")
data := vh.VehicleHist{}
setDataVehicleHist(input, &data)
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
} else {
tx = dg.I
}
if err := tx.Create(&data).Error; err != nil {
return plh.HandleCreateError(input, event, err)
}
pl.SetLogInfo(event, nil, "complete")
return nil
}
func ReadListData(input v.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]v.Vehicle, *v.MetaDto, error) {
pl.SetLogInfo(event, input, "started", "DBReadList")
data := []v.Vehicle{}