adjust vehicle hist

internal/use-case/main-use-case/vehicle/case.go

@@ -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

@@ -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

@@ -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{}