Selly-Modules
/
natsio
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

mergeDev/campaign #73

Closed
Ghost wants to merge 208 commits from mergeDev/campaign into develop
pull from: mergeDev/campaign
merge into: Selly-Modules:develop
Conversation 0 Commits 208 Files Changed 54 +12 -16
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0a9381065f - Show all commits

8
client/staff.go
View File

@ -16,16 +16,16 @@ func GetStaff() Staff {
} }
// GetListStaffInfoByNotificationAction ... // 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 { if err != nil {
return nil, err return nil, err
} }
var r struct { 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 { if err := json.Unmarshal(msg.Data, &r); err != nil {

8
model/staff_request.go
View File

@ -1,8 +1,6 @@
package model 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"`
} }

8
model/staff_response.go
View File

@ -1,10 +1,8 @@
package model 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 ... // ResponseStaffInfo ...

4
subject/staff.go
View File

@ -7,7 +7,7 @@ func getStaffValue(val string) string {
} }
var Staff = struct { 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"),
} }