Skip to content
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.

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

Scheduled post #848

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Comment cleanup
  • Loading branch information
harshilsharma63 committed Nov 14, 2024
commit d37d54e75e2a1650a30f45901574460890a7e4f3
7 changes: 3 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/gliderlabs/ssh v0.1.1
github.com/grafana/alloy/syntax v0.1.0
github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a
github.com/mattermost/mattermost/server/public v0.1.8-0.20241015185928-63c97f5a6d8f
github.com/mattermost/mattermost/server/public v0.1.9
github.com/mattermost/mattermost/server/v8 v8.0.0-20241015185928-63c97f5a6d8f
github.com/opensearch-project/opensearch-go/v4 v4.1.0
github.com/pelletier/go-toml/v2 v2.2.2
Expand Down Expand Up @@ -144,10 +144,9 @@ require (
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240725223205-93522f1f2a9f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
modernc.org/gc/v3 v3.0.0-20240722195230-4a140ff9c08e // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ github.com/mattermost/logr/v2 v2.0.21 h1:CMHsP+nrbRlEC4g7BwOk1GAnMtHkniFhlSQPXy5
github.com/mattermost/logr/v2 v2.0.21/go.mod h1:kZkB/zqKL9e+RY5gB3vGpsyenC+TpuiOenjMkvJJbzc=
github.com/mattermost/mattermost/server/public v0.1.8-0.20241015185928-63c97f5a6d8f h1:NUAf56HZHFLayAyCqHxeVLmxJUN9xw3Qxc9m3ghy+Xw=
github.com/mattermost/mattermost/server/public v0.1.8-0.20241015185928-63c97f5a6d8f/go.mod h1:SkTKbMul91Rq0v2dIxe8mqzUOY+3KwlwwLmAlxDfGCk=
github.com/mattermost/mattermost/server/public v0.1.9 h1:l/OKPRVuFeqL0yqRVC/JpveG5sLNKcT9llxqMkO9e+s=
github.com/mattermost/mattermost/server/public v0.1.9/go.mod h1:SkTKbMul91Rq0v2dIxe8mqzUOY+3KwlwwLmAlxDfGCk=
github.com/mattermost/mattermost/server/v8 v8.0.0-20241015185928-63c97f5a6d8f h1:h4T89Qkb3kddGnRN7xQAuB+fDaL3OgUgc5YPmssmzj8=
github.com/mattermost/mattermost/server/v8 v8.0.0-20241015185928-63c97f5a6d8f/go.mod h1:zwMZYGK4/xDy/kyepVBqXhM58YMTCRlanv/uKrZzJdw=
github.com/mattermost/morph v1.1.0 h1:Q9vrJbeM3s2jfweGheq12EFIzdNp9a/6IovcbvOQ6Cw=
Expand Down Expand Up @@ -649,10 +651,8 @@ google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk
google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20240725223205-93522f1f2a9f h1:htT2I9bZvGm+110zq8bIErMX+WgBWxCzV3ChwbvnKnc=
google.golang.org/genproto v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:Sk3mLpoDFTAp6R4OvlcUgaG4ISTspKeFsIAXMn9Bm4Y=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f h1:RARaIm8pxYuxyNPbBQf5igT7XdOyCNtat1qAT2ZxjU4=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
Expand All @@ -672,8 +672,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
6 changes: 3 additions & 3 deletions loadtest/control/simulcontroller/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,9 @@ func loadTeam(u user.User, team *model.Team, gqlEnabled bool) control.UserAction
return control.UserActionResponse{Err: control.NewUserError(err)}
}

//if err := u.GetTeamScheduledPosts(team.Id); err != nil {
// return control.UserActionResponse{Err: control.NewUserError(err)}
//}
if err := u.GetTeamScheduledPosts(team.Id); err != nil {
return control.UserActionResponse{Err: control.NewUserError(err)}
}

return control.UserActionResponse{Info: fmt.Sprintf("loaded team %s", team.Id)}
}
Expand Down
33 changes: 21 additions & 12 deletions loadtest/control/simulcontroller/scheduled_posts.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import (
)

func (c *SimulController) createScheduledPost(u user.User) control.UserActionResponse {
fmt.Println("createScheduledPost: start")

if ok, resp := control.ScheduledPostsEnabled(u); resp.Err != nil {
fmt.Println("createScheduledPost: ScheduledPostsEnabled error", resp.Err)
return resp
Expand All @@ -20,8 +18,6 @@ func (c *SimulController) createScheduledPost(u user.User) control.UserActionRes
return control.UserActionResponse{Info: "scheduled posts not enabled"}
}

fmt.Println("createScheduledPost: ScheduledPost is enabled")

channel, err := u.Store().CurrentChannel()
if err != nil {
fmt.Println("createScheduledPost: CurrentChannel error", err)
Expand Down Expand Up @@ -74,12 +70,17 @@ func (c *SimulController) createScheduledPost(u user.User) control.UserActionRes
return control.UserActionResponse{Err: control.NewUserError(err)}
}

fmt.Println("createScheduledPost: end")
return control.UserActionResponse{Info: fmt.Sprintf("scheduled post created in channel id %v", channel.Id)}
agarciamontoro marked this conversation as resolved.
Show resolved Hide resolved
}

func (c *SimulController) updateScheduledPost(u user.User) control.UserActionResponse {
fmt.Println("updateScheduledPost: start")
if ok, resp := control.ScheduledPostsEnabled(u); resp.Err != nil {
fmt.Println("updateScheduledPost: ScheduledPostsEnabled error", resp.Err)
return resp
} else if !ok {
fmt.Println("updateScheduledPost: ScheduledPosts not enabled")
return control.UserActionResponse{Info: "scheduled posts not enabled"}
}

scheduledPost, err := u.Store().GetRandomScheduledPost()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we ensuring GetRandomScheduledPost() always returns non-deleted posts, if any?

if err != nil {
Expand Down Expand Up @@ -111,12 +112,17 @@ func (c *SimulController) updateScheduledPost(u user.User) control.UserActionRes
return control.UserActionResponse{Err: control.NewUserError(err)}
}

fmt.Println("updateScheduledPost: end")
return control.UserActionResponse{Info: fmt.Sprintf("scheduled post updated in channel id %v", channel.Id)}
agarciamontoro marked this conversation as resolved.
Show resolved Hide resolved
}

func (c *SimulController) deleteScheduledPost(u user.User) control.UserActionResponse {
fmt.Println("deleteScheduledPost: start")
if ok, resp := control.ScheduledPostsEnabled(u); resp.Err != nil {
fmt.Println("deleteScheduledPost: ScheduledPostsEnabled error", resp.Err)
return resp
} else if !ok {
fmt.Println("deleteScheduledPost: ScheduledPosts not enabled")
return control.UserActionResponse{Info: "scheduled posts not enabled"}
}

scheduledPost, err := u.Store().GetRandomScheduledPost()
if err != nil {
Expand All @@ -134,13 +140,17 @@ func (c *SimulController) deleteScheduledPost(u user.User) control.UserActionRes
}

u.Store().DeleteScheduledPost(scheduledPost.Id)

fmt.Println("deleteScheduledPost: end")
return control.UserActionResponse{Info: fmt.Sprintf("scheduled post deleted with id %v", scheduledPost.Id)}
agarciamontoro marked this conversation as resolved.
Show resolved Hide resolved
}

func (c *SimulController) sendScheduledPost(u user.User) control.UserActionResponse {
harshilsharma63 marked this conversation as resolved.
Show resolved Hide resolved
fmt.Println("sendScheduledPost: start")
if ok, resp := control.ScheduledPostsEnabled(u); resp.Err != nil {
fmt.Println("sendScheduledPost: ScheduledPostsEnabled error", resp.Err)
return resp
} else if !ok {
fmt.Println("sendScheduledPost: ScheduledPosts not enabled")
return control.UserActionResponse{Info: "scheduled posts not enabled"}
}

scheduledPost, err := u.Store().GetRandomScheduledPost()
if err != nil {
Expand Down Expand Up @@ -170,6 +180,5 @@ func (c *SimulController) sendScheduledPost(u user.User) control.UserActionRespo

u.Store().DeleteScheduledPost(scheduledPost.Id)

fmt.Println("sendScheduledPost: end")
return control.UserActionResponse{Info: fmt.Sprintf("scheduled post sent with id %v", scheduledPost.Id)}
harshilsharma63 marked this conversation as resolved.
Show resolved Hide resolved
}
3 changes: 0 additions & 3 deletions loadtest/user/userentity/scheduled_posts.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ func (ue *UserEntity) DeleteScheduledPost(scheduledPostId string) error {
}

func (ue *UserEntity) GetTeamScheduledPosts(teamID string) error {
fmt.Println("GetTeamScheduledPosts: start")

scheduledPostsByTeam, _, err := ue.client.GetUserScheduledPosts(context.Background(), teamID, true)
if err != nil {
fmt.Println("GetTeamScheduledPosts: GetUserScheduledPosts error", err)
Expand All @@ -102,6 +100,5 @@ func (ue *UserEntity) GetTeamScheduledPosts(teamID string) error {
}
}

fmt.Println("GetTeamScheduledPosts: end")
return nil
}
Loading