Merge branch 'develop' into stage/hamed/add-search-param

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"`
 }

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"`
 }

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"`
 }

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"`
 }

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"`
 }

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"`
 }

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"`
 }

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
+}

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

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,
 		})
 	}

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
 }

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),
 		})
 	}
 

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
 }

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
 }

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
 }

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),
 		})
 	}
 

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
 }

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),
 		})
 	}
 

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
 }

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),
 		})
 	}
 

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
 }

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
 }

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),
 		})
 	}
 

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
 }

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
 }

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),
 		})
 	}