Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Commit

Permalink
feat(admin-api): deprecate user activity code
Browse files Browse the repository at this point in the history
  • Loading branch information
@JYisus
JYisus committed Jan 8, 2025
1 parent f7f17d0 commit ad13eaf
Show file tree
Hide file tree
Showing 33 changed files with 209 additions and 2,693 deletions.
1,219 changes: 106 additions & 1,113 deletions engine/admin-api/adapter/gql/generated.go
View file

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions engine/admin-api/adapter/gql/http_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@ import (
)

type Params struct {
Logger logr.Logger
ProductInteractor *usecase.ProductInteractor
UserInteractor *usecase.UserHandler
UserActivityInteractor usecase.UserActivityInteracter
VersionInteractor *version.Handler
ProcessHandler *process.Handler
LogsUsecase logs.LogsUsecase
SecretService *secret.Service
Logger logr.Logger
ProductInteractor *usecase.ProductInteractor
UserInteractor *usecase.UserHandler
VersionInteractor *version.Handler
ProcessHandler *process.Handler
LogsUsecase logs.LogsUsecase
SecretService *secret.Service
}

func NewHTTPHandler(params Params) http.Handler {
Expand Down
4 changes: 0 additions & 4 deletions engine/admin-api/adapter/gql/models.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 10 additions & 38 deletions engine/admin-api/adapter/gql/resolver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ func initialize() {
}

type Resolver struct {
logger logr.Logger
productInteractor *usecase.ProductInteractor
userInteractor *usecase.UserHandler
userActivityInteractor usecase.UserActivityInteracter
versionInteractor *version.Handler
processHandler *process.Handler
logsService logs.LogsUsecase
secretService *secret.Service
logger logr.Logger
productInteractor *usecase.ProductInteractor
userInteractor *usecase.UserHandler
versionInteractor *version.Handler
processHandler *process.Handler
logsService logs.LogsUsecase
secretService *secret.Service
}

func NewGraphQLResolver(params Params) *Resolver {
Expand All @@ -46,7 +45,6 @@ func NewGraphQLResolver(params Params) *Resolver {
params.Logger,
params.ProductInteractor,
params.UserInteractor,
params.UserActivityInteractor,
params.VersionInteractor,
params.ProcessHandler,
params.LogsUsecase,
Expand Down Expand Up @@ -130,7 +128,7 @@ func (r *mutationResolver) DeletePublicProcess(ctx context.Context, input Delete
func (r *mutationResolver) StartVersion(ctx context.Context, input StartVersionInput) (*entity.Version, error) {
loggedUser := ctx.Value("user").(*entity.User)

v, _, err := r.versionInteractor.Start(ctx, loggedUser, input.ProductID, input.VersionTag, input.Comment)
v, _, err := r.versionInteractor.Start(ctx, loggedUser, input.ProductID, input.VersionTag)
if err != nil {
r.logger.Error(err, "Unable to start version",
"productID", input.ProductID,
Expand All @@ -146,7 +144,7 @@ func (r *mutationResolver) StartVersion(ctx context.Context, input StartVersionI
func (r *mutationResolver) StopVersion(ctx context.Context, input StopVersionInput) (*entity.Version, error) {
loggedUser := ctx.Value("user").(*entity.User)

v, notifyCh, err := r.versionInteractor.Stop(ctx, loggedUser, input.ProductID, input.VersionTag, input.Comment)
v, notifyCh, err := r.versionInteractor.Stop(ctx, loggedUser, input.ProductID, input.VersionTag)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -177,7 +175,7 @@ func (r *mutationResolver) notifyVersionStatus(notifyCh chan *entity.Version) {

func (r *mutationResolver) UnpublishVersion(ctx context.Context, input UnpublishVersionInput) (*entity.Version, error) {
loggedUser := ctx.Value("user").(*entity.User)
return r.versionInteractor.Unpublish(ctx, loggedUser, input.ProductID, input.VersionTag, input.Comment)
return r.versionInteractor.Unpublish(ctx, loggedUser, input.ProductID, input.VersionTag)
}

func (r *mutationResolver) PublishVersion(ctx context.Context, input PublishVersionInput) ([]*entity.PublishedTrigger, error) {
Expand All @@ -186,7 +184,6 @@ func (r *mutationResolver) PublishVersion(ctx context.Context, input PublishVers
urls, err := r.versionInteractor.Publish(ctx, loggedUser, version.PublishOpts{
ProductID: input.ProductID,
VersionTag: input.VersionTag,
Comment: input.Comment,
Force: input.Force,
})
if err != nil {
Expand Down Expand Up @@ -351,19 +348,6 @@ func (r *queryResolver) RegisteredProcesses(
return r.processHandler.Search(ctx, loggedUser, productID, &filter)
}

func (r *queryResolver) UserActivityList(
ctx context.Context,
userEmail *string,
types []entity.UserActivityType,
versionIds []string,
fromDate *string,
toDate *string,
lastID *string,
) ([]*entity.UserActivity, error) {
loggedUser := ctx.Value("user").(*entity.User)
return r.userActivityInteractor.Get(ctx, loggedUser, userEmail, types, versionIds, fromDate, toDate, lastID)
}

func (r *queryResolver) Logs(
ctx context.Context,
filters entity.LogFilters,
Expand All @@ -379,14 +363,6 @@ func (r *productResolver) CreationDate(_ context.Context, obj *entity.Product) (
return obj.CreationDate.Format(time.RFC3339), nil
}

func (r *userActivityResolver) Date(_ context.Context, obj *entity.UserActivity) (string, error) {
return obj.Date.Format(time.RFC3339), nil
}

func (r *userActivityResolver) User(_ context.Context, obj *entity.UserActivity) (string, error) {
return obj.UserID, nil
}

func (r *versionResolver) CreationDate(_ context.Context, obj *entity.Version) (string, error) {
return obj.CreationDate.Format(time.RFC3339), nil
}
Expand Down Expand Up @@ -444,9 +420,6 @@ func (r *Resolver) Query() QueryResolver { return &queryResolver{r} }
// Product returns ProductResolver implementation.
func (r *Resolver) Product() ProductResolver { return &productResolver{r} }

// UserActivity returns UserActivityResolver implementation.
func (r *Resolver) UserActivity() UserActivityResolver { return &userActivityResolver{r} }

// Version returns VersionResolver implementation.
func (r *Resolver) Version() VersionResolver { return &versionResolver{r} }

Expand All @@ -461,7 +434,6 @@ func (r *Resolver) LogFilters() LogFiltersResolver { return &logFiltersResolver{
type mutationResolver struct{ *Resolver }
type queryResolver struct{ *Resolver }
type productResolver struct{ *Resolver }
type userActivityResolver struct{ *Resolver }
type versionResolver struct{ *Resolver }
type registeredProcessResolver struct{ *Resolver }

Expand Down
112 changes: 0 additions & 112 deletions engine/admin-api/adapter/repository/mongodb/user_activity.go
View file

This file was deleted.

1 change: 1 addition & 0 deletions engine/admin-api/adapter/service/proto/versionpb/version_grpc.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions engine/admin-api/casbin_rbac_policy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ p, USER, delete_registered_process

p, USER, manage_secrets

p, USER, view_user_activities

p, ADMIN, create_product
p, ADMIN, register_public_process
p, ADMIN, delete_public_process
Expand Down
46 changes: 21 additions & 25 deletions engine/admin-api/delivery/http/controller/graphql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,23 @@ type GraphQL interface {
}

type GraphQLController struct {
logger logr.Logger
productInteractor *usecase.ProductInteractor
userInteractor *usecase.UserHandler
userActivityInteractor usecase.UserActivityInteracter
versionInteractor *version.Handler
processHandler *process.Handler
LogsUsecase logs.LogsUsecase
SecretService *secret.Service
logger logr.Logger
productInteractor *usecase.ProductInteractor
userInteractor *usecase.UserHandler
versionInteractor *version.Handler
processHandler *process.Handler
LogsUsecase logs.LogsUsecase
SecretService *secret.Service
}

type Params struct {
Logger logr.Logger
ProductInteractor *usecase.ProductInteractor
UserInteractor *usecase.UserHandler
UserActivityInteractor usecase.UserActivityInteracter
VersionInteractor *version.Handler
ProcessHandler *process.Handler
LogsUsecase logs.LogsUsecase
SecretService *secret.Service
Logger logr.Logger
ProductInteractor *usecase.ProductInteractor
UserInteractor *usecase.UserHandler
VersionInteractor *version.Handler
ProcessHandler *process.Handler
LogsUsecase logs.LogsUsecase
SecretService *secret.Service
}

func NewGraphQLController(
Expand All @@ -53,7 +51,6 @@ func NewGraphQLController(
params.Logger,
params.ProductInteractor,
params.UserInteractor,
params.UserActivityInteractor,
params.VersionInteractor,
params.ProcessHandler,
params.LogsUsecase,
Expand All @@ -74,14 +71,13 @@ func (g *GraphQLController) GraphQLHandler(c echo.Context) error {
}

h := gql.NewHTTPHandler(gql.Params{
Logger: g.logger,
ProductInteractor: g.productInteractor,
UserInteractor: g.userInteractor,
UserActivityInteractor: g.userActivityInteractor,
VersionInteractor: g.versionInteractor,
ProcessHandler: g.processHandler,
LogsUsecase: g.LogsUsecase,
SecretService: g.SecretService,
Logger: g.logger,
ProductInteractor: g.productInteractor,
UserInteractor: g.userInteractor,
VersionInteractor: g.versionInteractor,
ProcessHandler: g.processHandler,
LogsUsecase: g.LogsUsecase,
SecretService: g.SecretService,
})

h.ServeHTTP(c.Response(), r.WithContext(ctx))
Expand Down
Loading

0 comments on commit ad13eaf

Please sign in to comment.