Skip to content

Commit 4a1ca29

Browse files
authored
refactor: project structure refactor (#138)
* refactor(store): put model package inside postgres * refactor: remove service interfaces from domain package * refactor: extract out job handlers from core packages * refactor: simplify jobs package
1 parent 33fd9f9 commit 4a1ca29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+622
-779
lines changed

api/handler/v1beta1/grpc.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
ctx_logrus "github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus"
99
guardianv1beta1 "github.com/odpf/guardian/api/proto/odpf/guardian/v1beta1"
1010
"github.com/odpf/guardian/core/appeal"
11+
"github.com/odpf/guardian/core/approval"
1112
"github.com/odpf/guardian/core/policy"
1213
"github.com/odpf/guardian/core/provider"
1314
"github.com/odpf/guardian/core/resource"
@@ -38,11 +39,11 @@ type ProtoAdapter interface {
3839
}
3940

4041
type GRPCServer struct {
41-
resourceService domain.ResourceService
42-
providerService domain.ProviderService
43-
policyService domain.PolicyService
44-
appealService domain.AppealService
45-
approvalService domain.ApprovalService
42+
resourceService *resource.Service
43+
providerService *provider.Service
44+
policyService *policy.Service
45+
appealService *appeal.Service
46+
approvalService *approval.Service
4647
adapter ProtoAdapter
4748

4849
authenticatedUserHeaderKey string
@@ -51,11 +52,11 @@ type GRPCServer struct {
5152
}
5253

5354
func NewGRPCServer(
54-
resourceService domain.ResourceService,
55-
providerService domain.ProviderService,
56-
policyService domain.PolicyService,
57-
appealService domain.AppealService,
58-
approvalService domain.ApprovalService,
55+
resourceService *resource.Service,
56+
providerService *provider.Service,
57+
policyService *policy.Service,
58+
appealService *appeal.Service,
59+
approvalService *approval.Service,
5960
adapter ProtoAdapter,
6061
authenticatedUserHeaderKey string,
6162
) *GRPCServer {

app/server.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/odpf/guardian/domain"
2222
"github.com/odpf/guardian/internal/crypto"
2323
"github.com/odpf/guardian/internal/scheduler"
24+
"github.com/odpf/guardian/jobs"
2425
"github.com/odpf/guardian/plugins/identities"
2526
"github.com/odpf/guardian/plugins/notifiers"
2627
"github.com/odpf/guardian/plugins/providers"
@@ -108,22 +109,26 @@ func RunServer(c *Config) error {
108109
logger,
109110
)
110111

111-
providerJobHandler := provider.NewJobHandler(providerService)
112-
appealJobHandler := appeal.NewJobHandler(logger, appealService, notifier)
112+
jobHandler := jobs.NewHandler(
113+
logger,
114+
appealService,
115+
providerService,
116+
notifier,
117+
)
113118

114119
// init scheduler
115120
tasks := []*scheduler.Task{
116121
{
117122
CronTab: c.Jobs.FetchResourcesInterval,
118-
Func: providerJobHandler.GetResources,
123+
Func: jobHandler.FetchResources,
119124
},
120125
{
121126
CronTab: c.Jobs.RevokeExpiredAccessInterval,
122-
Func: appealJobHandler.RevokeExpiredAccess,
127+
Func: jobHandler.RevokeExpiredAppeals,
123128
},
124129
{
125130
CronTab: c.Jobs.ExpiringAccessNotificationInterval,
126-
Func: appealJobHandler.NotifyAboutToExpireAccess,
131+
Func: jobHandler.AppealExpirationReminder,
127132
},
128133
}
129134
s, err := scheduler.New(tasks)

core/appeal/job_handler.go

Lines changed: 0 additions & 114 deletions
This file was deleted.

core/appeal/mocks/approvalService.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mocks/PolicyService.go renamed to core/appeal/mocks/policyService.go

Lines changed: 6 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/appeal/mocks/providerService.go

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)