Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

Commit 8b03b29

Browse files
author
Noah Lee
authored
Add model package (#257)
* Rename into extent * Fix vo into extent * Move into model pkg * Regenerate mock
1 parent 0093162 commit 8b03b29

File tree

231 files changed

+779
-779
lines changed

Some content is hidden

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

231 files changed

+779
-779
lines changed

‎cmd/license/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"log"
88
"time"
99

10-
"github.com/gitploy-io/gitploy/vo"
10+
"github.com/gitploy-io/gitploy/model/extent"
1111
)
1212

1313
const (
@@ -25,7 +25,7 @@ func main() {
2525
log.Fatal("Set the limit.")
2626
}
2727

28-
d := &vo.SigningData{
28+
d := &extent.SigningData{
2929
MemberLimit: *limit,
3030
ExpiredAt: time.Now().Add(year),
3131
}

‎cmd/server/db.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"entgo.io/ent/dialect"
1414
entsql "entgo.io/ent/dialect/sql"
1515

16-
"github.com/gitploy-io/gitploy/ent"
16+
"github.com/gitploy-io/gitploy/model/ent"
1717
)
1818

1919
func OpenDB(driver string, dsn string) (*ent.Client, error) {

‎cmd/server/db_oss.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77

88
"entgo.io/ent/dialect"
9-
"github.com/gitploy-io/gitploy/ent"
9+
"github.com/gitploy-io/gitploy/model/ent"
1010
)
1111

1212
func OpenDB(driver string, dsn string) (*ent.Client, error) {

‎internal/interactor/deployment.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"time"
77

88
"github.com/AlekSi/pointer"
9-
"github.com/gitploy-io/gitploy/ent"
10-
"github.com/gitploy-io/gitploy/ent/deployment"
11-
"github.com/gitploy-io/gitploy/ent/review"
9+
"github.com/gitploy-io/gitploy/model/ent"
10+
"github.com/gitploy-io/gitploy/model/ent/deployment"
11+
"github.com/gitploy-io/gitploy/model/ent/review"
12+
"github.com/gitploy-io/gitploy/model/extent"
1213
"github.com/gitploy-io/gitploy/pkg/e"
13-
"github.com/gitploy-io/gitploy/vo"
1414
"go.uber.org/zap"
1515
)
1616

@@ -32,7 +32,7 @@ func (i *Interactor) IsApproved(ctx context.Context, d *ent.Deployment) bool {
3232
return false
3333
}
3434

35-
func (i *Interactor) Deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error) {
35+
func (i *Interactor) Deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error) {
3636
if ok, err := i.isDeployable(ctx, u, r, d, env); !ok {
3737
return nil, err
3838
}
@@ -115,7 +115,7 @@ func (i *Interactor) Deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *en
115115
}
116116

117117
// DeployToRemote create a new remote deployment after the deployment was approved.
118-
func (i *Interactor) DeployToRemote(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error) {
118+
func (i *Interactor) DeployToRemote(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error) {
119119
if d.Status != deployment.StatusWaiting {
120120
return nil, e.NewErrorWithMessage(
121121
e.ErrorCodeDeploymentStatusInvalid,
@@ -159,7 +159,7 @@ func (i *Interactor) DeployToRemote(ctx context.Context, u *ent.User, r *ent.Rep
159159
return d, nil
160160
}
161161

162-
func (i *Interactor) createRemoteDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *vo.Env) (*vo.RemoteDeployment, error) {
162+
func (i *Interactor) createRemoteDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*extent.RemoteDeployment, error) {
163163
// Rollback configures it can deploy the ref without any constraints.
164164
// 1) Set auto_merge false to avoid the merge conflict.
165165
// 2) Set required_contexts empty to skip the verfication.
@@ -171,7 +171,7 @@ func (i *Interactor) createRemoteDeployment(ctx context.Context, u *ent.User, r
171171
return i.SCM.CreateRemoteDeployment(ctx, u, r, d, env)
172172
}
173173

174-
func (i *Interactor) isDeployable(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *vo.Env) (bool, error) {
174+
func (i *Interactor) isDeployable(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (bool, error) {
175175
if ok, err := env.IsDeployableRef(d.Ref); err != nil {
176176
return false, err
177177
} else if !ok {

‎internal/interactor/deployment_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"github.com/golang/mock/gomock"
1010
"go.uber.org/zap"
1111

12-
"github.com/gitploy-io/gitploy/ent"
13-
"github.com/gitploy-io/gitploy/ent/deployment"
14-
"github.com/gitploy-io/gitploy/ent/review"
1512
"github.com/gitploy-io/gitploy/internal/interactor/mock"
13+
"github.com/gitploy-io/gitploy/model/ent"
14+
"github.com/gitploy-io/gitploy/model/ent/deployment"
15+
"github.com/gitploy-io/gitploy/model/ent/review"
16+
"github.com/gitploy-io/gitploy/model/extent"
1617
"github.com/gitploy-io/gitploy/pkg/e"
17-
"github.com/gitploy-io/gitploy/vo"
1818
)
1919

2020
func newMockInteractor(store Store, scm SCM) *Interactor {
@@ -59,14 +59,14 @@ func TestInteractor_Deploy(t *testing.T) {
5959
t.Run("Return an error when the ref is not deployable", func(t *testing.T) {
6060
input := struct {
6161
d *ent.Deployment
62-
e *vo.Env
62+
e *extent.Env
6363
}{
6464
d: &ent.Deployment{
6565
Type: deployment.TypeBranch,
6666
Ref: "main",
6767
Env: "production",
6868
},
69-
e: &vo.Env{
69+
e: &extent.Env{
7070
DeployableRef: pointer.ToString("releast-.*"),
7171
},
7272
}
@@ -95,7 +95,7 @@ func TestInteractor_Deploy(t *testing.T) {
9595

9696
i := newMockInteractor(store, scm)
9797

98-
_, err := i.Deploy(context.Background(), &ent.User{}, &ent.Repo{}, &ent.Deployment{}, &vo.Env{})
98+
_, err := i.Deploy(context.Background(), &ent.User{}, &ent.Repo{}, &ent.Deployment{}, &extent.Env{})
9999
if !e.HasErrorCode(err, e.ErrorCodeDeploymentLocked) {
100100
t.Fatalf("Deploy' error = %v, wanted ErrorCodeDeploymentLocked", err)
101101
}
@@ -104,14 +104,14 @@ func TestInteractor_Deploy(t *testing.T) {
104104
t.Run("Return a new deployment.", func(t *testing.T) {
105105
input := struct {
106106
d *ent.Deployment
107-
e *vo.Env
107+
e *extent.Env
108108
}{
109109
d: &ent.Deployment{
110110
Type: deployment.TypeBranch,
111111
Ref: "main",
112112
Env: "production",
113113
},
114-
e: &vo.Env{},
114+
e: &extent.Env{},
115115
}
116116

117117
ctrl := gomock.NewController(t)
@@ -134,8 +134,8 @@ func TestInteractor_Deploy(t *testing.T) {
134134

135135
scm.
136136
EXPECT().
137-
CreateRemoteDeployment(ctx, gomock.Eq(&ent.User{}), gomock.Eq(&ent.Repo{}), gomock.AssignableToTypeOf(&ent.Deployment{}), gomock.Eq(&vo.Env{})).
138-
Return(&vo.RemoteDeployment{
137+
CreateRemoteDeployment(ctx, gomock.Eq(&ent.User{}), gomock.Eq(&ent.Repo{}), gomock.AssignableToTypeOf(&ent.Deployment{}), gomock.Eq(&extent.Env{})).
138+
Return(&extent.RemoteDeployment{
139139
UID: UID,
140140
}, nil)
141141

@@ -183,16 +183,16 @@ func TestInteractor_Deploy(t *testing.T) {
183183
t.Run("Return the waiting deployment and reviews.", func(t *testing.T) {
184184
input := struct {
185185
d *ent.Deployment
186-
e *vo.Env
186+
e *extent.Env
187187
}{
188188
d: &ent.Deployment{
189189
Number: 3,
190190
Type: deployment.TypeBranch,
191191
Ref: "main",
192192
Env: "production",
193193
},
194-
e: &vo.Env{
195-
Review: &vo.Review{
194+
e: &extent.Env{
195+
Review: &extent.Review{
196196
Enabled: true,
197197
Reviewers: []string{"octocat"},
198198
},
@@ -271,10 +271,10 @@ func TestInteractor_DeployToRemote(t *testing.T) {
271271
t.Run("Return an error when the deployment status is not waiting.", func(t *testing.T) {
272272
input := struct {
273273
d *ent.Deployment
274-
e *vo.Env
274+
e *extent.Env
275275
}{
276276
d: &ent.Deployment{},
277-
e: &vo.Env{},
277+
e: &extent.Env{},
278278
}
279279

280280
ctrl := gomock.NewController(t)
@@ -292,12 +292,12 @@ func TestInteractor_DeployToRemote(t *testing.T) {
292292
t.Run("Create a new remote deployment and update the deployment.", func(t *testing.T) {
293293
input := struct {
294294
d *ent.Deployment
295-
e *vo.Env
295+
e *extent.Env
296296
}{
297297
d: &ent.Deployment{
298298
Status: deployment.StatusWaiting,
299299
},
300-
e: &vo.Env{},
300+
e: &extent.Env{},
301301
}
302302

303303
ctrl := gomock.NewController(t)
@@ -325,8 +325,8 @@ func TestInteractor_DeployToRemote(t *testing.T) {
325325

326326
scm.
327327
EXPECT().
328-
CreateRemoteDeployment(ctx, gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), gomock.AssignableToTypeOf(&ent.Deployment{}), gomock.AssignableToTypeOf(&vo.Env{})).
329-
Return(&vo.RemoteDeployment{
328+
CreateRemoteDeployment(ctx, gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), gomock.AssignableToTypeOf(&ent.Deployment{}), gomock.AssignableToTypeOf(&extent.Env{})).
329+
Return(&extent.RemoteDeployment{
330330
UID: UID,
331331
}, nil)
332332

‎internal/interactor/deploymentstatistics.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/gitploy-io/gitploy/ent"
7+
"github.com/gitploy-io/gitploy/model/ent"
88
)
99

1010
func (i *Interactor) ProduceDeploymentStatisticsOfRepo(ctx context.Context, r *ent.Repo, d *ent.Deployment) (*ent.DeploymentStatistics, error) {

‎internal/interactor/deploymentstatistics_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/gitploy-io/gitploy/ent"
87
"github.com/gitploy-io/gitploy/internal/interactor/mock"
9-
"github.com/gitploy-io/gitploy/vo"
8+
"github.com/gitploy-io/gitploy/model/ent"
9+
"github.com/gitploy-io/gitploy/model/extent"
1010
"github.com/golang/mock/gomock"
1111
)
1212

@@ -101,7 +101,7 @@ func TestInteractor_ProduceDeploymentStatisticsOfRepo(t *testing.T) {
101101
scm.
102102
EXPECT().
103103
CompareCommits(gomock.Any(), gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
104-
Return([]*vo.Commit{}, []*vo.CommitFile{
104+
Return([]*extent.Commit{}, []*extent.CommitFile{
105105
{Additions: 1, Deletions: 1, Changes: 2},
106106
}, nil)
107107

‎internal/interactor/event.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"time"
66

7-
"github.com/gitploy-io/gitploy/ent"
7+
"github.com/gitploy-io/gitploy/model/ent"
88
"go.uber.org/zap"
99
)
1010

‎internal/interactor/interface.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"context"
77
"time"
88

9-
"github.com/gitploy-io/gitploy/ent"
10-
"github.com/gitploy-io/gitploy/ent/deployment"
11-
"github.com/gitploy-io/gitploy/vo"
9+
"github.com/gitploy-io/gitploy/model/ent"
10+
"github.com/gitploy-io/gitploy/model/ent/deployment"
11+
"github.com/gitploy-io/gitploy/model/extent"
1212
)
1313

1414
type (
@@ -33,7 +33,7 @@ type (
3333
FindRepoOfUserByID(ctx context.Context, u *ent.User, id int64) (*ent.Repo, error)
3434
FindRepoOfUserByNamespaceName(ctx context.Context, u *ent.User, namespace, name string) (*ent.Repo, error)
3535
FindRepoByID(ctx context.Context, id int64) (*ent.Repo, error)
36-
SyncRepo(ctx context.Context, r *vo.RemoteRepo) (*ent.Repo, error)
36+
SyncRepo(ctx context.Context, r *extent.RemoteRepo) (*ent.Repo, error)
3737
UpdateRepo(ctx context.Context, r *ent.Repo) (*ent.Repo, error)
3838
Activate(ctx context.Context, r *ent.Repo) (*ent.Repo, error)
3939
Deactivate(ctx context.Context, r *ent.Repo) (*ent.Repo, error)
@@ -91,30 +91,30 @@ type (
9191
}
9292

9393
SCM interface {
94-
GetRemoteUserByToken(ctx context.Context, token string) (*vo.RemoteUser, error)
94+
GetRemoteUserByToken(ctx context.Context, token string) (*extent.RemoteUser, error)
9595
ListRemoteOrgsByToken(ctx context.Context, token string) ([]string, error)
9696

97-
ListRemoteRepos(ctx context.Context, u *ent.User) ([]*vo.RemoteRepo, error)
97+
ListRemoteRepos(ctx context.Context, u *ent.User) ([]*extent.RemoteRepo, error)
9898

9999
// SCM returns the deployment with UID and SHA.
100-
CreateRemoteDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, e *vo.Env) (*vo.RemoteDeployment, error)
100+
CreateRemoteDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, e *extent.Env) (*extent.RemoteDeployment, error)
101101
CancelDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, s *ent.DeploymentStatus) error
102-
GetConfig(ctx context.Context, u *ent.User, r *ent.Repo) (*vo.Config, error)
102+
GetConfig(ctx context.Context, u *ent.User, r *ent.Repo) (*extent.Config, error)
103103

104-
CreateWebhook(ctx context.Context, u *ent.User, r *ent.Repo, c *vo.WebhookConfig) (int64, error)
104+
CreateWebhook(ctx context.Context, u *ent.User, r *ent.Repo, c *extent.WebhookConfig) (int64, error)
105105
DeleteWebhook(ctx context.Context, u *ent.User, r *ent.Repo, id int64) error
106106

107-
ListCommits(ctx context.Context, u *ent.User, r *ent.Repo, branch string, page, perPage int) ([]*vo.Commit, error)
108-
CompareCommits(ctx context.Context, u *ent.User, r *ent.Repo, base, head string, page, perPage int) ([]*vo.Commit, []*vo.CommitFile, error)
109-
GetCommit(ctx context.Context, u *ent.User, r *ent.Repo, sha string) (*vo.Commit, error)
110-
ListCommitStatuses(ctx context.Context, u *ent.User, r *ent.Repo, sha string) ([]*vo.Status, error)
107+
ListCommits(ctx context.Context, u *ent.User, r *ent.Repo, branch string, page, perPage int) ([]*extent.Commit, error)
108+
CompareCommits(ctx context.Context, u *ent.User, r *ent.Repo, base, head string, page, perPage int) ([]*extent.Commit, []*extent.CommitFile, error)
109+
GetCommit(ctx context.Context, u *ent.User, r *ent.Repo, sha string) (*extent.Commit, error)
110+
ListCommitStatuses(ctx context.Context, u *ent.User, r *ent.Repo, sha string) ([]*extent.Status, error)
111111

112-
ListBranches(ctx context.Context, u *ent.User, r *ent.Repo, page, perPage int) ([]*vo.Branch, error)
113-
GetBranch(ctx context.Context, u *ent.User, r *ent.Repo, branch string) (*vo.Branch, error)
112+
ListBranches(ctx context.Context, u *ent.User, r *ent.Repo, page, perPage int) ([]*extent.Branch, error)
113+
GetBranch(ctx context.Context, u *ent.User, r *ent.Repo, branch string) (*extent.Branch, error)
114114

115-
ListTags(ctx context.Context, u *ent.User, r *ent.Repo, page, perPage int) ([]*vo.Tag, error)
116-
GetTag(ctx context.Context, u *ent.User, r *ent.Repo, tag string) (*vo.Tag, error)
115+
ListTags(ctx context.Context, u *ent.User, r *ent.Repo, page, perPage int) ([]*extent.Tag, error)
116+
GetTag(ctx context.Context, u *ent.User, r *ent.Repo, tag string) (*extent.Tag, error)
117117

118-
GetRateLimit(ctx context.Context, u *ent.User) (*vo.RateLimit, error)
118+
GetRateLimit(ctx context.Context, u *ent.User) (*extent.RateLimit, error)
119119
}
120120
)

‎internal/interactor/license.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ package interactor
99
import (
1010
"context"
1111

12+
"github.com/gitploy-io/gitploy/model/extent"
1213
"github.com/gitploy-io/gitploy/pkg/e"
1314
"github.com/gitploy-io/gitploy/pkg/license"
14-
"github.com/gitploy-io/gitploy/vo"
1515
)
1616

17-
func (i *Interactor) GetLicense(ctx context.Context) (*vo.License, error) {
17+
func (i *Interactor) GetLicense(ctx context.Context) (*extent.License, error) {
1818
var (
1919
memberCnt int
2020
deploymentCnt int
21-
d *vo.SigningData
21+
d *extent.SigningData
2222
err error
2323
)
2424

@@ -31,7 +31,7 @@ func (i *Interactor) GetLicense(ctx context.Context) (*vo.License, error) {
3131
}
3232

3333
if i.licenseKey == "" {
34-
lic := vo.NewTrialLicense(memberCnt, deploymentCnt)
34+
lic := extent.NewTrialLicense(memberCnt, deploymentCnt)
3535
return lic, nil
3636
}
3737

@@ -42,6 +42,6 @@ func (i *Interactor) GetLicense(ctx context.Context) (*vo.License, error) {
4242
)
4343
}
4444

45-
lic := vo.NewStandardLicense(memberCnt, d)
45+
lic := extent.NewStandardLicense(memberCnt, d)
4646
return lic, nil
4747
}

0 commit comments

Comments
 (0)