Merge pull request #784 from traPtitech/more-golangci-lint

golangci-lintのルール増やす
traPtitech · Jul 23, 2024 · 1db6bd3 · 1db6bd3
2 parents 5c20e25 + 9848a4f
commit 1db6bd3
Show file tree

Hide file tree

Showing 51 changed files with 1,981 additions and 474 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -10,3 +10,37 @@ linters:
     - unused
     # https://golangci-lint.run/usage/linters/#disabled-by-default
     - gofmt
+    - asasalint
+    - asciicheck
+    - contextcheck
+    - dogsled
+    - durationcheck
+    - errchkjson
+    - errname
+    - errorlint
+    - exhaustive
+    - fatcontext
+    - forbidigo
+    - forcetypeassert
+    - gocheckcompilerdirectives
+    - importas
+    - inamedparam
+    - intrange
+    - ireturn
+    - lll
+    - loggercheck
+    - makezero
+    - mirror
+    - musttag
+    - nilnil
+    - predeclared
+    - reassign
+    - thelper
+    - unconvert
+    - usestdlibvars
+    - wastedassign
+    - whitespace
+linters-settings:
+  lll:
+    line-length: 100
+    tab-width: 4
diff --git a/model/admin_impl_test.go b/model/admin_impl_test.go
@@ -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)
@@ -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})
@@ -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})

diff --git a/model/comment.go b/model/comment.go
@@ -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
 }
diff --git a/model/comment_impl.go b/model/comment_impl.go
@@ -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)).
@@ -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).
@@ -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).
@@ -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(