From 6f6643552db82b1615be994e61af9534f652a5cd Mon Sep 17 00:00:00 2001 From: Hamed Xamani Date: Sun, 6 Oct 2024 17:21:14 +0330 Subject: [PATCH] fix(delivery): remove unused filter from delivery to service layer (#165) --- .../agent/kind_box/get_all_return_awaiting.go | 4 ++-- .../agent/kind_box_req/get_all_delivery_awaiting.go | 6 ++++-- delivery/http_server/benefactor/kind_box/get_all.go | 4 ++-- .../http_server/benefactor/kind_box_req/get_all.go | 3 +-- docs/docs.go | 12 ------------ docs/swagger.json | 12 ------------ docs/swagger.yaml | 8 -------- param/agent/kind_box/get_all_return_awaiting.go | 9 ++++++--- .../agent/kind_box_req/get_all_delivery_awaiting.go | 9 ++++++--- param/benefactor/kind_box/get_all.go | 7 ++++--- param/benefactor/kind_box_req/get_all.go | 7 ++++--- service/agent/kind_box/get_all_return_awaiting.go | 3 +++ .../agent/kind_box_req/get_all_delivery_awaiting.go | 2 ++ service/benefactor/kind_box/get_all.go | 1 + service/benefactor/kind_box_req/get_all.go | 1 + validator/agent/kind_box/get_all_return_awaiting.go | 1 - .../agent/kind_box_req/get_all_delivery_awaiting.go | 1 - validator/benefactor/kind_box/get_all.go | 1 - validator/benefactor/kind_box_req/get_all.go | 1 - 19 files changed, 36 insertions(+), 56 deletions(-) diff --git a/delivery/http_server/agent/kind_box/get_all_return_awaiting.go b/delivery/http_server/agent/kind_box/get_all_return_awaiting.go index 7e29b5ef..3979ed7a 100644 --- a/delivery/http_server/agent/kind_box/get_all_return_awaiting.go +++ b/delivery/http_server/agent/kind_box/get_all_return_awaiting.go @@ -44,8 +44,8 @@ func (h Handler) GetAll(c echo.Context) error { } req.Filter = queryparam.GetFilterParams(c) - req.Filter["receiver_agent_id"] = claim.GetClaimsFromEchoContext(c).UserID - req.Filter["status"] = entity.KindBoxAssignedReceiverAgentStatus + req.ReceiverAgentId = claim.GetClaimsFromEchoContext(c).UserID + req.Status = entity.KindBoxAssignedReceiverAgentStatus resp, err := h.agentKindBoxSvc.GetAll(c.Request().Context(), req) if err != nil { diff --git a/delivery/http_server/agent/kind_box_req/get_all_delivery_awaiting.go b/delivery/http_server/agent/kind_box_req/get_all_delivery_awaiting.go index d1d390dd..4665f580 100644 --- a/delivery/http_server/agent/kind_box_req/get_all_delivery_awaiting.go +++ b/delivery/http_server/agent/kind_box_req/get_all_delivery_awaiting.go @@ -40,8 +40,10 @@ func (h Handler) GetAllAwaitingDelivery(c echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest) } req.Filter = queryparam.GetFilterParams(c) - req.Filter["sender_agent_id"] = claim.GetClaimsFromEchoContext(c).UserID - req.Filter["status"] = entity.KindBoxReqAssignedSenderAgentStatus + + req.SenderAgentId = claim.GetClaimsFromEchoContext(c).UserID + req.Status = entity.KindBoxReqAssignedSenderAgentStatus + resp, sErr := h.agentKindBoxReqSvc.GetAllAwaitingDelivery(c.Request().Context(), req) if sErr != nil { msg, code := httpmsg.Error(sErr) diff --git a/delivery/http_server/benefactor/kind_box/get_all.go b/delivery/http_server/benefactor/kind_box/get_all.go index cd99fa8e..bdab2e76 100644 --- a/delivery/http_server/benefactor/kind_box/get_all.go +++ b/delivery/http_server/benefactor/kind_box/get_all.go @@ -18,7 +18,6 @@ import ( // @Produce json // @Param filter_id query int false "Filter by ID" // @Param filter_kind_box_req_id query int false "Filter by KindBox request ID" -// @Param filter_benefactor_id query int false "Filter by benefactor ID" // @Param filter_kind_box_type query string false "Filter by KindBox type" Enums(on-table,cylindrical,stand-up) // @Param filter_amount query int false "Filter by amount" // @Param filter_serial_number query string false "Filter by serial number" @@ -49,7 +48,8 @@ func (h Handler) GetAll(c echo.Context) error { } req.Filter = queryparam.GetFilterParams(c) - req.Filter["benefactor_id"] = claim.GetClaimsFromEchoContext(c).UserID + req.BenefactorId = claim.GetClaimsFromEchoContext(c).UserID + resp, sErr := h.benefactorKindBoxSvc.GetAll(c.Request().Context(), req) if sErr != nil { msg, code := httpmsg.Error(sErr) diff --git a/delivery/http_server/benefactor/kind_box_req/get_all.go b/delivery/http_server/benefactor/kind_box_req/get_all.go index 71f51489..93c2e823 100644 --- a/delivery/http_server/benefactor/kind_box_req/get_all.go +++ b/delivery/http_server/benefactor/kind_box_req/get_all.go @@ -17,7 +17,6 @@ import ( // @Accept json // @Produce json // @Param filter_id query int false "Filter by ID" -// @Param filter_benefactor_id query int false "Filter by benefactor ID" // @Param filter_kind_box_type query entity.KindBoxType false "Filter by KindBox type" Format(enum) // @Param filter_status query string false "Filter by KindBoxReq Status" Enums(pending,accepted,assigned-sender-agent,rejected,delivered) // @Param filter_count_requested query int false "Filter by count requested" @@ -41,7 +40,7 @@ func (h Handler) GetAll(c echo.Context) error { } req.Filter = queryparam.GetFilterParams(c) - req.Filter["benefactor_id"] = claim.GetClaimsFromEchoContext(c).UserID + req.BenefactorId = claim.GetClaimsFromEchoContext(c).UserID resp, sErr := h.benefactorKindBoxReqSvc.GetAll(c.Request().Context(), req) if sErr != nil { diff --git a/docs/docs.go b/docs/docs.go index 00127322..dfd882f6 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1897,12 +1897,6 @@ const docTemplate = `{ "name": "filter_kind_box_req_id", "in": "query" }, - { - "type": "integer", - "description": "Filter by benefactor ID", - "name": "filter_benefactor_id", - "in": "query" - }, { "enum": [ "on-table", @@ -2186,12 +2180,6 @@ const docTemplate = `{ "name": "filter_id", "in": "query" }, - { - "type": "integer", - "description": "Filter by benefactor ID", - "name": "filter_benefactor_id", - "in": "query" - }, { "enum": [ "on-table", diff --git a/docs/swagger.json b/docs/swagger.json index 8bf8d363..7d84a94e 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1886,12 +1886,6 @@ "name": "filter_kind_box_req_id", "in": "query" }, - { - "type": "integer", - "description": "Filter by benefactor ID", - "name": "filter_benefactor_id", - "in": "query" - }, { "enum": [ "on-table", @@ -2175,12 +2169,6 @@ "name": "filter_id", "in": "query" }, - { - "type": "integer", - "description": "Filter by benefactor ID", - "name": "filter_benefactor_id", - "in": "query" - }, { "enum": [ "on-table", diff --git a/docs/swagger.yaml b/docs/swagger.yaml index ec1637fb..26600f18 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2190,10 +2190,6 @@ paths: in: query name: filter_kind_box_req_id type: integer - - description: Filter by benefactor ID - in: query - name: filter_benefactor_id - type: integer - description: Filter by KindBox type enum: - on-table @@ -2388,10 +2384,6 @@ paths: in: query name: filter_id type: integer - - description: Filter by benefactor ID - in: query - name: filter_benefactor_id - type: integer - description: Filter by KindBox type enum: - on-table diff --git a/param/agent/kind_box/get_all_return_awaiting.go b/param/agent/kind_box/get_all_return_awaiting.go index cc91b1d9..a6d780fd 100644 --- a/param/agent/kind_box/get_all_return_awaiting.go +++ b/param/agent/kind_box/get_all_return_awaiting.go @@ -1,13 +1,16 @@ package agentkindboxparam import ( + "git.gocasts.ir/ebhomengo/niki/entity" "git.gocasts.ir/ebhomengo/niki/param" ) type GetAllRequest struct { - Pagination param.PaginationRequest - Sort param.SortRequest - Filter param.FilterRequest + Pagination param.PaginationRequest + Sort param.SortRequest + Filter param.FilterRequest + ReceiverAgentId uint + Status entity.KindBoxStatus } type GetAllResponse struct { diff --git a/param/agent/kind_box_req/get_all_delivery_awaiting.go b/param/agent/kind_box_req/get_all_delivery_awaiting.go index 2634e7de..c10b1a7c 100644 --- a/param/agent/kind_box_req/get_all_delivery_awaiting.go +++ b/param/agent/kind_box_req/get_all_delivery_awaiting.go @@ -1,13 +1,16 @@ package agentkindboxreqparam import ( + "git.gocasts.ir/ebhomengo/niki/entity" "git.gocasts.ir/ebhomengo/niki/param" ) type DeliveryAwaitingGetAllRequest struct { - Pagination param.PaginationRequest - Sort param.SortRequest - Filter param.FilterRequest + Pagination param.PaginationRequest + Sort param.SortRequest + Filter param.FilterRequest + SenderAgentId uint + Status entity.KindBoxReqStatus } type DeliveryAwaitingGetAllResponse struct { diff --git a/param/benefactor/kind_box/get_all.go b/param/benefactor/kind_box/get_all.go index 54b5ae7d..fce92220 100644 --- a/param/benefactor/kind_box/get_all.go +++ b/param/benefactor/kind_box/get_all.go @@ -5,9 +5,10 @@ import ( ) type KindBoxGetAllRequest struct { - Pagination param.PaginationRequest - Sort param.SortRequest - Filter param.FilterRequest + Pagination param.PaginationRequest + Sort param.SortRequest + Filter param.FilterRequest + BenefactorId uint } type KindBoxGetAllResponse struct { diff --git a/param/benefactor/kind_box_req/get_all.go b/param/benefactor/kind_box_req/get_all.go index b99bb821..969d8859 100644 --- a/param/benefactor/kind_box_req/get_all.go +++ b/param/benefactor/kind_box_req/get_all.go @@ -5,9 +5,10 @@ import ( ) type GetAllRequest struct { - Pagination param.PaginationRequest - Sort param.SortRequest - Filter param.FilterRequest + Pagination param.PaginationRequest + Sort param.SortRequest + Filter param.FilterRequest + BenefactorId uint } type GetAllResponse struct { diff --git a/service/agent/kind_box/get_all_return_awaiting.go b/service/agent/kind_box/get_all_return_awaiting.go index 6f1a94de..e8bbc491 100644 --- a/service/agent/kind_box/get_all_return_awaiting.go +++ b/service/agent/kind_box/get_all_return_awaiting.go @@ -17,6 +17,9 @@ func (s Service) GetAll(ctx context.Context, req param.GetAllRequest) (param.Get req.Pagination.GetPageSize() req.Pagination.GetPageNumber() + req.Filter["receiver_agent_id"] = req.ReceiverAgentId + req.Filter["status"] = req.Status + allKindBoxes, total, err := s.repo.GetAllKindBox(ctx, req.Filter, req.Pagination, req.Sort) if err != nil { return param.GetAllResponse{}, richerror.New(op).WithErr(err) 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 5664f1a0..12589bc2 100644 --- a/service/agent/kind_box_req/get_all_delivery_awaiting.go +++ b/service/agent/kind_box_req/get_all_delivery_awaiting.go @@ -17,6 +17,8 @@ func (s Service) GetAllAwaitingDelivery(ctx context.Context, req param.DeliveryA req.Pagination.GetPageSize() req.Pagination.GetPageNumber() + req.Filter["sender_agent_id"] = req.SenderAgentId + req.Filter["status"] = req.Status allAwaitingKindBoxReq, total, err := s.repo.GetAllKindBoxReq(ctx, req.Filter, req.Pagination, req.Sort) if err != nil { diff --git a/service/benefactor/kind_box/get_all.go b/service/benefactor/kind_box/get_all.go index 271df2dd..8fa615b2 100644 --- a/service/benefactor/kind_box/get_all.go +++ b/service/benefactor/kind_box/get_all.go @@ -14,6 +14,7 @@ func (s Service) GetAll(ctx context.Context, req param.KindBoxGetAllRequest) (pa return param.KindBoxGetAllResponse{FieldErrors: fieldErrors}, richerror.New(op).WithErr(vErr) } + req.Filter["benefactor_id"] = req.BenefactorId req.Pagination.GetPageSize() req.Pagination.GetPageNumber() diff --git a/service/benefactor/kind_box_req/get_all.go b/service/benefactor/kind_box_req/get_all.go index dfe5bb10..8398a367 100644 --- a/service/benefactor/kind_box_req/get_all.go +++ b/service/benefactor/kind_box_req/get_all.go @@ -14,6 +14,7 @@ func (s Service) GetAll(ctx context.Context, req param.GetAllRequest) (param.Get return param.GetAllResponse{FieldErrors: fieldErrors}, richerror.New(op).WithErr(vErr) } + req.Filter["benefactor_id"] = req.BenefactorId req.Pagination.GetPageSize() req.Pagination.GetPageNumber() diff --git a/validator/agent/kind_box/get_all_return_awaiting.go b/validator/agent/kind_box/get_all_return_awaiting.go index 1bc92408..9df2e17d 100644 --- a/validator/agent/kind_box/get_all_return_awaiting.go +++ b/validator/agent/kind_box/get_all_return_awaiting.go @@ -13,7 +13,6 @@ func (v Validator) ValidateGetAll(req param.GetAllRequest) (map[string]string, e const op = "agentkindboxvalidator.ValidateGetAll" validFields := []string{ "id", "kind_box_req_id", - "receiver_agent_id", "status", "benefactor_id", "type", "serial_number", "return_refer_time_id", "return_refer_date", "return_address_id", } diff --git a/validator/agent/kind_box_req/get_all_delivery_awaiting.go b/validator/agent/kind_box_req/get_all_delivery_awaiting.go index b37e1044..552c33e6 100644 --- a/validator/agent/kind_box_req/get_all_delivery_awaiting.go +++ b/validator/agent/kind_box_req/get_all_delivery_awaiting.go @@ -12,7 +12,6 @@ func (v Validator) ValidateGetAllAwaitingDelivery(req kbrparam.DeliveryAwaitingG const op = "adminkindboxreqvalidator.ValidateGetAllAwaitingDelivery" validFields := []string{ "id", "benefactor_id", "kind_box_type", - "sender_agent_id", "status", "count_requested", "count_accepted", "deliver_refer_time_id", "deliver_refer_date", "deliver_address_id", } diff --git a/validator/benefactor/kind_box/get_all.go b/validator/benefactor/kind_box/get_all.go index 290cc564..39e3b49d 100644 --- a/validator/benefactor/kind_box/get_all.go +++ b/validator/benefactor/kind_box/get_all.go @@ -14,7 +14,6 @@ func (v Validator) ValidateGetAll(req param.KindBoxGetAllRequest) (map[string]st validFields := []string{ "id", "kind_box_req_id", "kind_box_type", "amount", "serial_number", - "benefactor_id", "status", "deliver_refer_time_id", "deliver_refer_date", "deliver_address_id", "sender_agent_id", "delivered_at", "return_refer_time_id", "return_refer_date", "return_address_id", "receiver_agent_id", "returned_at", diff --git a/validator/benefactor/kind_box_req/get_all.go b/validator/benefactor/kind_box_req/get_all.go index eee931e4..7965fc35 100644 --- a/validator/benefactor/kind_box_req/get_all.go +++ b/validator/benefactor/kind_box_req/get_all.go @@ -13,7 +13,6 @@ func (v Validator) ValidateGetAll(req param.GetAllRequest) (map[string]string, e const op = "benefactorkindboxreqvalidator.ValidateGetAllAwaitingDelivery" validFields := []string{ "id", "kind_box_type", "status", "sender_agent_id", - "benefactor_id", "count_requested", "count_accepted", "deliver_refer_time_id", "deliver_refer_date", "deliver_address_id", }