client/staff.go

@@ -16,16 +16,16 @@ func GetStaff() Staff {
 }
 
 // GetListStaffInfoByNotificationAction ...
-func (s Staff) GetListStaffInfoByNotificationAction(p model.GetListStaffByNotificationActionRequest) (*model.ResponseListStaffInfoByNotificationAction, error) {
+func (s Staff) GetListStaffInfoByNotificationAction(p model.GetListStaffRequest) (*model.ResponseListStaffInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Staff.GetListStaffInfoByNotificationAction, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Staff.GetListStaffInfo, toBytes(p))
 
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  *model.ResponseListStaffInfoByNotificationAction `json:"data"`
+		Data  *model.ResponseListStaffInfo `json:"data"`
-		Error string                                           `json:"error"`
+		Error string                       `json:"error"`
 	}
 
 	if err := json.Unmarshal(msg.Data, &r); err != nil {

model/staff_request.go

@@ -1,8 +1,6 @@
 package model
 
-// GetListStaffByNotificationActionRequest ...
+// GetListStaffRequest ...
-type GetListStaffByNotificationActionRequest struct {
+type GetListStaffRequest struct {
-	CreatedBys   []string `json:"createdBys"`
+	Staffs []string `json:"Staffs"`
-	ApprovedBys  []string `json:"approvedBys"`
-	CancelledBys []string `json:"cancelledBys"`
 }

model/staff_response.go

@@ -1,10 +1,8 @@
 package model
 
-// ResponseListStaffInfoByNotificationAction ...
+// ResponseListStaffInfo ...
-type ResponseListStaffInfoByNotificationAction struct {
+type ResponseListStaffInfo struct {
-	CreatedBys   []ResponseStaffInfo `json:"CreatedBys"`
+	Staffs []ResponseStaffInfo `json:"staffs"`
-	ApprovedBys  []ResponseStaffInfo `json:"ApprovedBys"`
-	CancelledBys []ResponseStaffInfo `json:"CancelledBys"`
 }
 
 // ResponseStaffInfo ...

subject/staff.go

@@ -7,7 +7,7 @@ func getStaffValue(val string) string {
 }
 
 var Staff = struct {
-	GetListStaffInfoByNotificationAction string
+	GetListStaffInfo string
 }{
-	GetListStaffInfoByNotificationAction: getStaffValue("get_list_staff_info_by_notification_info"),
+	GetListStaffInfo: getStaffValue("get_list_staff_info_by_notification_info"),
 }