diff --git a/param/admin/benefactor/data.go b/param/admin/benefactor/data.go index d0aec69a..08a82bdd 100644 --- a/param/admin/benefactor/data.go +++ b/param/admin/benefactor/data.go @@ -1,8 +1,9 @@ package adminbenefactoreparam import ( - "git.gocasts.ir/ebhomengo/niki/entity" "time" + + "git.gocasts.ir/ebhomengo/niki/entity" ) type Data struct { @@ -13,6 +14,6 @@ type Data struct { Description string `json:"description"` Email string `json:"email"` Gender entity.Gender `json:"gender"` - BirthDate time.Time `json:"birth_date"` + BirthDate *time.Time `json:"birth_date"` Status entity.BenefactorStatus `json:"status"` } diff --git a/param/admin/kind_box/data.go b/param/admin/kind_box/data.go index 438e192e..90d5359d 100644 --- a/param/admin/kind_box/data.go +++ b/param/admin/kind_box/data.go @@ -20,8 +20,8 @@ type Data struct { SenderAgentID uint `json:"sender_agent_id"` DeliveredAt time.Time `json:"delivered_at"` ReturnReferTimeID uint `json:"return_refer_time_id"` - ReturnReferDate time.Time `json:"return_refer_date"` + ReturnReferDate *time.Time `json:"return_refer_date"` ReturnAddressID uint `json:"return_address_id"` ReceiverAgentID uint `json:"receiver_agent_id"` - ReturnedAt time.Time `json:"returned_at"` + ReturnedAt *time.Time `json:"returned_at"` } diff --git a/param/admin/kind_box_req/data.go b/param/admin/kind_box_req/data.go index 2a4008c0..674b212f 100644 --- a/param/admin/kind_box_req/data.go +++ b/param/admin/kind_box_req/data.go @@ -18,5 +18,5 @@ type Data struct { DeliverReferDate time.Time `json:"deliver_refer_date"` DeliverAddressID uint `json:"deliver_address_id"` SenderAgentID uint `json:"sender_agent_id"` - DeliveredAt time.Time `json:"delivered_at"` + DeliveredAt *time.Time `json:"delivered_at"` } diff --git a/param/agent/kind_box/data.go b/param/agent/kind_box/data.go index 55c6a2c5..440b3cfa 100644 --- a/param/agent/kind_box/data.go +++ b/param/agent/kind_box/data.go @@ -20,8 +20,8 @@ type Data struct { SenderAgentID uint `json:"sender_agent_id"` DeliveredAt time.Time `json:"delivered_at"` ReturnReferTimeID uint `json:"return_refer_time_id"` - ReturnReferDate time.Time `json:"return_refer_date"` + ReturnReferDate *time.Time `json:"return_refer_date"` ReturnAddressID uint `json:"return_address_id"` ReceiverAgentID uint `json:"receiver_agent_id"` - ReturnedAt time.Time `json:"returned_at"` + ReturnedAt *time.Time `json:"returned_at"` } diff --git a/param/agent/kind_box_req/data.go b/param/agent/kind_box_req/data.go index b73b1048..11eefe1b 100644 --- a/param/agent/kind_box_req/data.go +++ b/param/agent/kind_box_req/data.go @@ -18,5 +18,5 @@ type Data struct { DeliverReferDate time.Time `json:"deliver_refer_date"` DeliverAddressID uint `json:"deliver_address_id"` SenderAgentID uint `json:"sender_agent_id"` - DeliveredAt time.Time `json:"delivered_at"` + DeliveredAt *time.Time `json:"delivered_at"` } diff --git a/param/benefactor/kind_box/data.go b/param/benefactor/kind_box/data.go index ab441966..10f13e09 100644 --- a/param/benefactor/kind_box/data.go +++ b/param/benefactor/kind_box/data.go @@ -20,8 +20,8 @@ type Data struct { SenderAgentID uint `json:"sender_agent_id"` DeliveredAt time.Time `json:"delivered_at"` ReturnReferTimeID uint `json:"return_refer_time_id"` - ReturnReferDate time.Time `json:"return_refer_date"` + ReturnReferDate *time.Time `json:"return_refer_date"` ReturnAddressID uint `json:"return_address_id"` ReceiverAgentID uint `json:"receiver_agent_id"` - ReturnedAt time.Time `json:"returned_at"` + ReturnedAt *time.Time `json:"returned_at"` } diff --git a/param/benefactor/kind_box_req/data.go b/param/benefactor/kind_box_req/data.go index 8d3aace6..fe9b3447 100644 --- a/param/benefactor/kind_box_req/data.go +++ b/param/benefactor/kind_box_req/data.go @@ -18,5 +18,5 @@ type Data struct { DeliverReferDate time.Time `json:"deliver_refer_date"` DeliverAddressID uint `json:"deliver_address_id"` SenderAgentID uint `json:"sender_agent_id"` - DeliveredAt time.Time `json:"delivered_at"` + DeliveredAt *time.Time `json:"delivered_at"` } diff --git a/pkg/response_builder/null_date.go b/pkg/response_builder/null_date.go new file mode 100644 index 00000000..62fb5caf --- /dev/null +++ b/pkg/response_builder/null_date.go @@ -0,0 +1,11 @@ +package response_builder + +import "time" + +func GetNullDate(time time.Time) *time.Time { + nullDate := &time + if time.IsZero() { + nullDate = nil + } + return nullDate +} diff --git a/service/admin/benefactor/get.go b/service/admin/benefactor/get.go index f652a3ef..14997ba2 100644 --- a/service/admin/benefactor/get.go +++ b/service/admin/benefactor/get.go @@ -2,7 +2,9 @@ package adminbenefactorservice import ( "context" + param "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -23,7 +25,7 @@ func (s Service) GetByID(ctx context.Context, req param.GetBenefactorByIDRequest Description: bnf.Description, Email: bnf.Email, Gender: bnf.Gender, - BirthDate: bnf.BirthDate, + BirthDate: response.GetNullDate(bnf.BirthDate), Status: bnf.Status, }, }, nil diff --git a/service/admin/benefactor/get_all.go b/service/admin/benefactor/get_all.go index 6ed982a3..aa2ec414 100644 --- a/service/admin/benefactor/get_all.go +++ b/service/admin/benefactor/get_all.go @@ -5,6 +5,7 @@ import ( paginationparam "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -32,7 +33,7 @@ func (s Service) GetAllBenefactor(ctx context.Context, req param.BenefactorGetAl Description: benefactor.Description, Email: benefactor.Email, Gender: benefactor.Gender, - BirthDate: benefactor.BirthDate, + BirthDate: response.GetNullDate(benefactor.BirthDate), Status: benefactor.Status, }) } diff --git a/service/admin/kind_box/get.go b/service/admin/kind_box/get.go index 0348ac93..d1c01604 100644 --- a/service/admin/kind_box/get.go +++ b/service/admin/kind_box/get.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -31,9 +32,9 @@ func (s Service) Get(ctx context.Context, req param.KindBoxGetRequest) (param.Ki SenderAgentID: kindBox.SenderAgentID, DeliveredAt: kindBox.DeliveredAt, ReturnReferTimeID: kindBox.ReturnReferTimeID, - ReturnReferDate: kindBox.ReturnReferDate, + ReturnReferDate: response.GetNullDate(kindBox.ReturnReferDate), ReturnAddressID: kindBox.ReturnAddressID, ReceiverAgentID: kindBox.ReceiverAgentID, - ReturnedAt: kindBox.ReturnedAt, + ReturnedAt: response.GetNullDate(kindBox.ReturnedAt), }}, nil } diff --git a/service/admin/kind_box/get_all.go b/service/admin/kind_box/get_all.go index 307c3799..a42cad5f 100644 --- a/service/admin/kind_box/get_all.go +++ b/service/admin/kind_box/get_all.go @@ -5,6 +5,7 @@ import ( paginationparam "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -39,10 +40,10 @@ func (s Service) GetAll(ctx context.Context, req param.KindBoxGetAllRequest) (pa SenderAgentID: kindBox.SenderAgentID, DeliveredAt: kindBox.DeliveredAt, ReturnReferTimeID: kindBox.ReturnReferTimeID, - ReturnReferDate: kindBox.ReturnReferDate, + ReturnReferDate: response.GetNullDate(kindBox.ReturnReferDate), ReturnAddressID: kindBox.ReturnAddressID, ReceiverAgentID: kindBox.ReceiverAgentID, - ReturnedAt: kindBox.ReturnedAt, + ReturnedAt: response.GetNullDate(kindBox.ReturnedAt), }) } diff --git a/service/admin/kind_box_req/accept.go b/service/admin/kind_box_req/accept.go index dcbd2780..3bd67982 100644 --- a/service/admin/kind_box_req/accept.go +++ b/service/admin/kind_box_req/accept.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -39,6 +40,6 @@ func (s Service) Accept(ctx context.Context, req param.KindBoxReqAcceptRequest) DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }}, nil } diff --git a/service/admin/kind_box_req/add.go b/service/admin/kind_box_req/add.go index 808ca7f3..89b929d2 100644 --- a/service/admin/kind_box_req/add.go +++ b/service/admin/kind_box_req/add.go @@ -5,6 +5,7 @@ import ( "git.gocasts.ir/ebhomengo/niki/entity" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -38,6 +39,6 @@ func (s Service) Add(ctx context.Context, req param.KindBoxReqAddRequest) (param DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }}, nil } diff --git a/service/admin/kind_box_req/get.go b/service/admin/kind_box_req/get.go index 14e81d4c..17ea6b20 100644 --- a/service/admin/kind_box_req/get.go +++ b/service/admin/kind_box_req/get.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -30,7 +31,7 @@ func (s Service) Get(ctx context.Context, req param.GetKindBoxReqRequest) (param DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }, }, nil } diff --git a/service/admin/kind_box_req/get_all.go b/service/admin/kind_box_req/get_all.go index a9ba514e..cc41bf6d 100644 --- a/service/admin/kind_box_req/get_all.go +++ b/service/admin/kind_box_req/get_all.go @@ -5,6 +5,7 @@ import ( paginationparam "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -36,7 +37,7 @@ func (s Service) GetAll(ctx context.Context, req param.KindBoxReqGetAllRequest) DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }) } diff --git a/service/admin/kind_box_req/reject.go b/service/admin/kind_box_req/reject.go index 28cb3fec..3a6fb0e0 100644 --- a/service/admin/kind_box_req/reject.go +++ b/service/admin/kind_box_req/reject.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -35,7 +36,7 @@ func (s Service) Reject(ctx context.Context, req param.KindBoxReqRejectRequest) DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }, }, nil } diff --git a/service/agent/kind_box/get_all_return_awaiting.go b/service/agent/kind_box/get_all_return_awaiting.go index f21e793a..5f2ff26f 100644 --- a/service/agent/kind_box/get_all_return_awaiting.go +++ b/service/agent/kind_box/get_all_return_awaiting.go @@ -5,6 +5,7 @@ import ( paginationparam "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/agent/kind_box" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -41,10 +42,10 @@ func (s Service) GetAll(ctx context.Context, req param.GetAllRequest) (param.Get SenderAgentID: kindBox.SenderAgentID, DeliveredAt: kindBox.DeliveredAt, ReturnReferTimeID: kindBox.ReturnReferTimeID, - ReturnReferDate: kindBox.ReturnReferDate, + ReturnReferDate: response.GetNullDate(kindBox.ReturnReferDate), ReturnAddressID: kindBox.ReturnAddressID, ReceiverAgentID: kindBox.ReceiverAgentID, - ReturnedAt: kindBox.ReturnedAt, + ReturnedAt: response.GetNullDate(kindBox.ReturnedAt), }) } diff --git a/service/agent/kind_box/get_return_awaiting.go b/service/agent/kind_box/get_return_awaiting.go index 5170ceb2..f1f336e6 100644 --- a/service/agent/kind_box/get_return_awaiting.go +++ b/service/agent/kind_box/get_return_awaiting.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/agent/kind_box" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -32,10 +33,10 @@ func (s Service) Get(ctx context.Context, req param.GetKindBoxRequest) (param.Ge SenderAgentID: kindBox.SenderAgentID, DeliveredAt: kindBox.DeliveredAt, ReturnReferTimeID: kindBox.ReturnReferTimeID, - ReturnReferDate: kindBox.ReturnReferDate, + ReturnReferDate: response.GetNullDate(kindBox.ReturnReferDate), ReturnAddressID: kindBox.ReturnAddressID, ReceiverAgentID: kindBox.ReceiverAgentID, - ReturnedAt: kindBox.ReturnedAt, + ReturnedAt: response.GetNullDate(kindBox.ReturnedAt), }, }, nil } diff --git a/service/agent/kind_box_req/get_all_delivery_awaiting.go b/service/agent/kind_box_req/get_all_delivery_awaiting.go index 29150146..4f1673e0 100644 --- a/service/agent/kind_box_req/get_all_delivery_awaiting.go +++ b/service/agent/kind_box_req/get_all_delivery_awaiting.go @@ -5,6 +5,7 @@ import ( paginationparam "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/agent/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -38,7 +39,7 @@ func (s Service) GetAllAwaitingDelivery(ctx context.Context, req param.DeliveryA DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }) } diff --git a/service/agent/kind_box_req/get_delivery_awaiting.go b/service/agent/kind_box_req/get_delivery_awaiting.go index 4f71653b..ce3f93f9 100644 --- a/service/agent/kind_box_req/get_delivery_awaiting.go +++ b/service/agent/kind_box_req/get_delivery_awaiting.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/agent/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -30,7 +31,7 @@ func (s Service) GetAwaitingDelivery(ctx context.Context, req param.DeliveryAwai DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }, }, nil } diff --git a/service/benefactor/kind_box/get.go b/service/benefactor/kind_box/get.go index 7232d051..ae55fedc 100644 --- a/service/benefactor/kind_box/get.go +++ b/service/benefactor/kind_box/get.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/benefactor/kind_box" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -31,9 +32,9 @@ func (s Service) Get(ctx context.Context, req param.KindBoxGetRequest) (param.Ki SenderAgentID: kindBox.SenderAgentID, DeliveredAt: kindBox.DeliveredAt, ReturnReferTimeID: kindBox.ReturnReferTimeID, - ReturnReferDate: kindBox.ReturnReferDate, + ReturnReferDate: response.GetNullDate(kindBox.ReturnReferDate), ReturnAddressID: kindBox.ReturnAddressID, ReceiverAgentID: kindBox.ReceiverAgentID, - ReturnedAt: kindBox.ReturnedAt, + ReturnedAt: response.GetNullDate(kindBox.ReturnedAt), }}, nil } diff --git a/service/benefactor/kind_box/get_all.go b/service/benefactor/kind_box/get_all.go index 3881800a..f085d2d8 100644 --- a/service/benefactor/kind_box/get_all.go +++ b/service/benefactor/kind_box/get_all.go @@ -5,6 +5,7 @@ import ( params "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/benefactor/kind_box" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -39,10 +40,10 @@ func (s Service) GetAll(ctx context.Context, req param.KindBoxGetAllRequest) (pa SenderAgentID: kindBox.SenderAgentID, DeliveredAt: kindBox.DeliveredAt, ReturnReferTimeID: kindBox.ReturnReferTimeID, - ReturnReferDate: kindBox.ReturnReferDate, + ReturnReferDate: response.GetNullDate(kindBox.ReturnReferDate), ReturnAddressID: kindBox.ReturnAddressID, ReceiverAgentID: kindBox.ReceiverAgentID, - ReturnedAt: kindBox.ReturnedAt, + ReturnedAt: response.GetNullDate(kindBox.ReturnedAt), }) } diff --git a/service/benefactor/kind_box_req/add.go b/service/benefactor/kind_box_req/add.go index 31460e09..77806842 100644 --- a/service/benefactor/kind_box_req/add.go +++ b/service/benefactor/kind_box_req/add.go @@ -5,6 +5,7 @@ import ( "git.gocasts.ir/ebhomengo/niki/entity" param "git.gocasts.ir/ebhomengo/niki/param/benefactor/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -38,6 +39,6 @@ func (s Service) Add(ctx context.Context, req param.KindBoxReqAddRequest) (param DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }}, nil } diff --git a/service/benefactor/kind_box_req/get.go b/service/benefactor/kind_box_req/get.go index 560bd079..840da3d9 100644 --- a/service/benefactor/kind_box_req/get.go +++ b/service/benefactor/kind_box_req/get.go @@ -4,6 +4,7 @@ import ( "context" param "git.gocasts.ir/ebhomengo/niki/param/benefactor/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -30,6 +31,6 @@ func (s Service) Get(ctx context.Context, req param.KindBoxReqGetRequest) (param DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }}, nil } diff --git a/service/benefactor/kind_box_req/get_all.go b/service/benefactor/kind_box_req/get_all.go index 5b66d116..fb4560d6 100644 --- a/service/benefactor/kind_box_req/get_all.go +++ b/service/benefactor/kind_box_req/get_all.go @@ -5,6 +5,7 @@ import ( params "git.gocasts.ir/ebhomengo/niki/param" param "git.gocasts.ir/ebhomengo/niki/param/benefactor/kind_box_req" + response "git.gocasts.ir/ebhomengo/niki/pkg/response_builder" richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error" ) @@ -37,7 +38,7 @@ func (s Service) GetAll(ctx context.Context, req param.GetAllRequest) (param.Get DeliverReferDate: kindBoxReq.DeliverReferDate, DeliverAddressID: kindBoxReq.DeliverAddressID, SenderAgentID: kindBoxReq.SenderAgentID, - DeliveredAt: kindBoxReq.DeliveredAt, + DeliveredAt: response.GetNullDate(kindBoxReq.DeliveredAt), }) }