Skip to content

Commit

Permalink
🎨 Format too long lines in model (lll)
Browse files Browse the repository at this point in the history
  • Loading branch information
H1rono committed Jul 19, 2024
1 parent 7fb9e23 commit 3a0847d
Show file tree
Hide file tree
Showing 27 changed files with 1,293 additions and 298 deletions.
24 changes: 20 additions & 4 deletions model/admin_impl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,17 @@ func TestEntRepository_GetAdmins(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user1, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user1, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
user2, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user2, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)

got, err := repo.GetAdmins(ctx)
Expand Down Expand Up @@ -54,7 +62,11 @@ func TestEntRepository_AddAdmins(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), false)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
false)
require.NoError(t, err)

err = repo.AddAdmins(ctx, []uuid.UUID{user.ID})
Expand All @@ -74,7 +86,11 @@ func TestEntRepository_DeleteAdmins(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)

err = repo.DeleteAdmins(ctx, []uuid.UUID{user.ID})
Expand Down
8 changes: 6 additions & 2 deletions model/comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ type Comment struct {

type CommentRepository interface {
GetComments(ctx context.Context, requestID uuid.UUID) ([]*Comment, error)
CreateComment(ctx context.Context, comment string, requestID uuid.UUID, userID uuid.UUID) (*Comment, error)
UpdateComment(ctx context.Context, comment string, requestID uuid.UUID, commentID uuid.UUID) (*Comment, error)
CreateComment(
ctx context.Context, comment string, requestID uuid.UUID, userID uuid.UUID,
) (*Comment, error)
UpdateComment(
ctx context.Context, comment string, requestID uuid.UUID, commentID uuid.UUID,
) (*Comment, error)
DeleteComment(ctx context.Context, requestID uuid.UUID, commentID uuid.UUID) error
}
16 changes: 12 additions & 4 deletions model/comment_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import (
"github.com/traPtitech/Jomon/ent/request"
)

func (repo *EntRepository) GetComments(ctx context.Context, requestID uuid.UUID) ([]*Comment, error) {
func (repo *EntRepository) GetComments(
ctx context.Context, requestID uuid.UUID,
) ([]*Comment, error) {
_, err := repo.client.Request.
Query().
Where(request.IDEQ(requestID)).
Expand Down Expand Up @@ -38,7 +40,9 @@ func (repo *EntRepository) GetComments(ctx context.Context, requestID uuid.UUID)
return modelcomments, nil
}

func (repo *EntRepository) CreateComment(ctx context.Context, comment string, requestID uuid.UUID, userID uuid.UUID) (*Comment, error) {
func (repo *EntRepository) CreateComment(
ctx context.Context, comment string, requestID uuid.UUID, userID uuid.UUID,
) (*Comment, error) {
created, err := repo.client.Comment.
Create().
SetComment(comment).
Expand All @@ -51,7 +55,9 @@ func (repo *EntRepository) CreateComment(ctx context.Context, comment string, re
return ConvertEntCommentToModelComment(created, userID), nil
}

func (repo *EntRepository) UpdateComment(ctx context.Context, commentContent string, requestID uuid.UUID, commentID uuid.UUID) (*Comment, error) {
func (repo *EntRepository) UpdateComment(
ctx context.Context, commentContent string, requestID uuid.UUID, commentID uuid.UUID,
) (*Comment, error) {
updated, err := repo.client.Comment.
UpdateOneID(commentID).
SetComment(commentContent).
Expand All @@ -72,7 +78,9 @@ func (repo *EntRepository) UpdateComment(ctx context.Context, commentContent str
return ConvertEntCommentToModelComment(updated, updatedWithUser.Edges.User.ID), nil
}

func (repo *EntRepository) DeleteComment(ctx context.Context, requestID uuid.UUID, commentID uuid.UUID) error {
func (repo *EntRepository) DeleteComment(
ctx context.Context, requestID uuid.UUID, commentID uuid.UUID,
) error {
c, err := repo.client.Comment.
Query().
Where(
Expand Down
185 changes: 150 additions & 35 deletions model/comment_impl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,18 @@ func TestEntRepository_GetComments(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)

comment1, err := repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request.ID, user.ID)
Expand Down Expand Up @@ -52,9 +61,18 @@ func TestEntRepository_GetComments(t *testing.T) {

t.Run("Success2", func(t *testing.T) {
t.Parallel()
user, err := repo2.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user, err := repo2.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo2.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
request, err := repo2.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)

got, err := repo2.GetComments(ctx, request.ID)
Expand All @@ -77,13 +95,26 @@ func TestEntRepository_CreateComment(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)

comment := random.AlphaNumeric(t, 30)
user2, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user2, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
created, err := repo.CreateComment(ctx, comment, request.ID, user2.ID)
assert.NoError(t, err)
Expand All @@ -93,17 +124,30 @@ func TestEntRepository_CreateComment(t *testing.T) {

t.Run("UnknownRequest", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
_, err = repo.CreateComment(ctx, random.AlphaNumeric(t, 30), uuid.New(), user.ID)
assert.Error(t, err)
})

t.Run("UnknownUser", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)

_, err = repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request.ID, uuid.New())
Expand All @@ -119,9 +163,18 @@ func TestEntREpository_UpdateComment(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)
created, err := repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request.ID, user.ID)
require.NoError(t, err)
Expand All @@ -136,14 +189,28 @@ func TestEntREpository_UpdateComment(t *testing.T) {

t.Run("Success2", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request1, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request1, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)
comment, err := repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request1.ID, user.ID)
require.NoError(t, err)

request2, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
request2, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)
updated, err := repo.UpdateComment(ctx, comment.Comment, request2.ID, comment.ID)
assert.NoError(t, err)
Expand All @@ -160,20 +227,41 @@ func TestEntREpository_UpdateComment(t *testing.T) {

t.Run("UnknownComment", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
require.NoError(t, err)

_, err = repo.UpdateComment(ctx, random.AlphaNumeric(t, 30), request.ID, uuid.New())
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)

_, err = repo.UpdateComment(
ctx,
random.AlphaNumeric(t, 30),
request.ID, uuid.New())
assert.Error(t, err)
})

t.Run("UnknownRequest", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)
comment, err := repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request.ID, user.ID)
require.NoError(t, err)
Expand All @@ -191,9 +279,18 @@ func TestEntRepository_DeleteComment(t *testing.T) {

t.Run("Success", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)
comment, err := repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request.ID, user.ID)
require.NoError(t, err)
Expand All @@ -204,9 +301,18 @@ func TestEntRepository_DeleteComment(t *testing.T) {

t.Run("UnknownRequest", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)
comment, err := repo.CreateComment(ctx, random.AlphaNumeric(t, 30), request.ID, user.ID)
require.NoError(t, err)
Expand All @@ -217,9 +323,18 @@ func TestEntRepository_DeleteComment(t *testing.T) {

t.Run("UnknownComment", func(t *testing.T) {
t.Parallel()
user, err := repo.CreateUser(ctx, random.AlphaNumeric(t, 20), random.AlphaNumeric(t, 30), true)
require.NoError(t, err)
request, err := repo.CreateRequest(ctx, random.AlphaNumeric(t, 40), random.AlphaNumeric(t, 100), []*Tag{}, []*RequestTarget{}, nil, user.ID)
user, err := repo.CreateUser(
ctx,
random.AlphaNumeric(t, 20),
random.AlphaNumeric(t, 30),
true)
require.NoError(t, err)
request, err := repo.CreateRequest(
ctx,
random.AlphaNumeric(t, 40),
random.AlphaNumeric(t, 100),
[]*Tag{}, []*RequestTarget{},
nil, user.ID)
require.NoError(t, err)

err = repo.DeleteComment(ctx, request.ID, uuid.New())
Expand Down
4 changes: 3 additions & 1 deletion model/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import (
)

type FileRepository interface {
CreateFile(ctx context.Context, name string, mimetype string, requestID uuid.UUID, userID uuid.UUID) (*File, error)
CreateFile(
ctx context.Context, name string, mimetype string, requestID uuid.UUID, userID uuid.UUID,
) (*File, error)
GetFile(ctx context.Context, fileID uuid.UUID) (*File, error)
DeleteFile(ctx context.Context, fileID uuid.UUID) error
}
Expand Down
Loading

0 comments on commit 3a0847d

Please sign in to comment.