Skip to content

[WTEL-9474]refactor(ws/member): fetch draft argument from WS input and #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suifri wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WTEL-9474]refactor(ws/member): fetch draft argument from WS input and #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions app/cc_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,19 @@ func (app *App) ListOfflineQueueForAgent(ctx context.Context, domainId int64, se
return list, search.EndOfList(), nil
}

func (app *App) ReportingAttempt(attemptId int64, status, description string, nextOffering *int64, expireAt *int64, vars map[string]string,
stickyDisplay bool, agentId int32, excludeDes bool, waitBetweenRetries *int32, onlyComm bool) model.AppError {

func (app *App) ReportingAttempt(
attemptId int64,
status, description string,
nextOffering *int64,
expireAt *int64,
vars map[string]string,
stickyDisplay bool,
agentId int32,
excludeDes bool,
waitBetweenRetries *int32,
onlyComm bool,
draft bool,
) model.AppError {
res := &cc.AttemptResultRequest{
AttemptId: attemptId,
Status: status,
Expand All @@ -243,6 +253,7 @@ func (app *App) ReportingAttempt(attemptId int64, status, description string, ne
AgentId: agentId,
ExcludeCurrentCommunication: excludeDes,
OnlyCurrentCommunication: onlyComm,
Draft: draft,
}

if expireAt != nil {
Expand All @@ -257,9 +268,7 @@ func (app *App) ReportingAttempt(attemptId int64, status, description string, ne
res.WaitBetweenRetries = *waitBetweenRetries
}

err := app.cc.Member().AttemptResult(res)

if err != nil {
if err := app.cc.Member().AttemptResult(res); err != nil {
return model.NewBadRequestError("app.cc_member.reporting.app_err", err.Error())
}

Expand Down
32 changes: 28 additions & 4 deletions controller/member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,39 @@ func (c *Controller) ListOfflineQueueForAgent(ctx context.Context, session *auth
return c.app.ListOfflineQueueForAgent(ctx, session.DomainId, search)
}

func (c *Controller) ReportingAttempt(session *auth_manager.Session, attemptId int64, status, description string, nextOffering *int64,
expireAt *int64, vars map[string]string, stickyDisplay bool, agentId int32, exclDes bool, waitBetweenRetries *int32, onlyComm bool) model.AppError {
func (c *Controller) ReportingAttempt(
session *auth_manager.Session,
attemptId int64,
status, description string,
nextOffering *int64,
expireAt *int64,
vars map[string]string,
stickyDisplay bool,
agentId int32,
exclDes bool,
waitBetweenRetries *int32,
onlyComm bool,
draft bool,
) model.AppError {
permission := session.GetPermission(model.PERMISSION_SCOPE_CC_QUEUE)
if !permission.CanRead() {
return c.app.MakePermissionError(session, permission, auth_manager.PERMISSION_ACCESS_READ)
}

return c.app.ReportingAttempt(attemptId, status, description, nextOffering, expireAt, vars, stickyDisplay, agentId, exclDes,
waitBetweenRetries, onlyComm)
return c.app.ReportingAttempt(
attemptId,
status,
description,
nextOffering,
expireAt,
vars,
stickyDisplay,
agentId,
exclDes,
waitBetweenRetries,
onlyComm,
draft,
)
}

func (c *Controller) RenewalAttempt(session *auth_manager.Session, attemptId int64, renewal uint32) model.AppError {
Expand Down
Loading
Loading