From 241928e0a0f5aadbbd0e2767ac380fff5ed63ae9 Mon Sep 17 00:00:00 2001 From: KinjiKawaguchi Date: Fri, 1 Mar 2024 17:42:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20typing-server=E3=81=AE=E3=83=A2?= =?UTF-8?q?=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=E3=83=91=E3=82=B9=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typing-server/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typing-server/go.mod b/typing-server/go.mod index ae4d50b..5130d9a 100644 --- a/typing-server/go.mod +++ b/typing-server/go.mod @@ -1,4 +1,4 @@ -module ent +module github.com/su-its/typing/typing-server go 1.22.0 From 33a821c5cf3877d4bcde29d9a57bac6790e4a758 Mon Sep 17 00:00:00 2001 From: KinjiKawaguchi Date: Fri, 1 Mar 2024 17:42:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E3=82=A8=E3=83=B3=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=83=86=E3=82=A3=E3=81=AE=E3=83=91=E3=83=83=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=83=91=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typing-server/domain/repository/ent/client.go | 9 ++++----- typing-server/domain/repository/ent/ent.go | 4 ++-- typing-server/domain/repository/ent/enttest/enttest.go | 8 ++++---- typing-server/domain/repository/ent/hook/hook.go | 3 ++- typing-server/domain/repository/ent/mutation.go | 6 +++--- typing-server/domain/repository/ent/runtime.go | 6 +++--- typing-server/domain/repository/ent/runtime/runtime.go | 2 +- typing-server/domain/repository/ent/score.go | 2 +- typing-server/domain/repository/ent/score/where.go | 2 +- typing-server/domain/repository/ent/score_create.go | 2 +- typing-server/domain/repository/ent/score_delete.go | 4 ++-- typing-server/domain/repository/ent/score_query.go | 4 ++-- typing-server/domain/repository/ent/score_update.go | 4 ++-- typing-server/domain/repository/ent/user.go | 2 +- typing-server/domain/repository/ent/user/where.go | 2 +- typing-server/domain/repository/ent/user_create.go | 4 ++-- typing-server/domain/repository/ent/user_delete.go | 4 ++-- typing-server/domain/repository/ent/user_query.go | 6 +++--- typing-server/domain/repository/ent/user_update.go | 6 +++--- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/typing-server/domain/repository/ent/client.go b/typing-server/domain/repository/ent/client.go index 56ec560..8b9be77 100644 --- a/typing-server/domain/repository/ent/client.go +++ b/typing-server/domain/repository/ent/client.go @@ -9,16 +9,15 @@ import ( "log" "reflect" - "ent/ent/migrate" - - "ent/ent/score" - "ent/ent/user" + "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/migrate" "entgo.io/ent" "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // Client is the client that holds all ent builders. diff --git a/typing-server/domain/repository/ent/ent.go b/typing-server/domain/repository/ent/ent.go index 14b3132..c4ef585 100644 --- a/typing-server/domain/repository/ent/ent.go +++ b/typing-server/domain/repository/ent/ent.go @@ -4,8 +4,6 @@ package ent import ( "context" - "ent/ent/score" - "ent/ent/user" "errors" "fmt" "reflect" @@ -14,6 +12,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // ent aliases to avoid import conflicts in user's code. diff --git a/typing-server/domain/repository/ent/enttest/enttest.go b/typing-server/domain/repository/ent/enttest/enttest.go index 5e0930d..314b1ad 100644 --- a/typing-server/domain/repository/ent/enttest/enttest.go +++ b/typing-server/domain/repository/ent/enttest/enttest.go @@ -4,13 +4,13 @@ package enttest import ( "context" - "ent/ent" - // required by schema hooks. - _ "ent/ent/runtime" - "ent/ent/migrate" + "github.com/su-its/typing/typing-server/domain/repository/ent" + // required by schema hooks. + _ "github.com/su-its/typing/typing-server/domain/repository/ent/runtime" "entgo.io/ent/dialect/sql/schema" + "github.com/su-its/typing/typing-server/domain/repository/ent/migrate" ) type ( diff --git a/typing-server/domain/repository/ent/hook/hook.go b/typing-server/domain/repository/ent/hook/hook.go index 0097275..8a9e587 100644 --- a/typing-server/domain/repository/ent/hook/hook.go +++ b/typing-server/domain/repository/ent/hook/hook.go @@ -4,8 +4,9 @@ package hook import ( "context" - "ent/ent" "fmt" + + "github.com/su-its/typing/typing-server/domain/repository/ent" ) // The ScoreFunc type is an adapter to allow the use of ordinary diff --git a/typing-server/domain/repository/ent/mutation.go b/typing-server/domain/repository/ent/mutation.go index b8cac58..ab90132 100644 --- a/typing-server/domain/repository/ent/mutation.go +++ b/typing-server/domain/repository/ent/mutation.go @@ -4,9 +4,6 @@ package ent import ( "context" - "ent/ent/predicate" - "ent/ent/score" - "ent/ent/user" "errors" "fmt" "sync" @@ -15,6 +12,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) const ( diff --git a/typing-server/domain/repository/ent/runtime.go b/typing-server/domain/repository/ent/runtime.go index 8ce9a49..46ed455 100644 --- a/typing-server/domain/repository/ent/runtime.go +++ b/typing-server/domain/repository/ent/runtime.go @@ -3,12 +3,12 @@ package ent import ( - "ent/ent/schema" - "ent/ent/score" - "ent/ent/user" "time" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/schema" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // The init function reads all schema descriptors with runtime code diff --git a/typing-server/domain/repository/ent/runtime/runtime.go b/typing-server/domain/repository/ent/runtime/runtime.go index 9a125bf..303062f 100644 --- a/typing-server/domain/repository/ent/runtime/runtime.go +++ b/typing-server/domain/repository/ent/runtime/runtime.go @@ -2,7 +2,7 @@ package runtime -// The schema-stitching logic is generated in ent/ent/runtime.go +// The schema-stitching logic is generated in github.com/su-its/typing/typing-server/domain/repository/ent/runtime.go const ( Version = "v0.13.1" // Version of ent codegen. diff --git a/typing-server/domain/repository/ent/score.go b/typing-server/domain/repository/ent/score.go index 09f68f3..feedf18 100644 --- a/typing-server/domain/repository/ent/score.go +++ b/typing-server/domain/repository/ent/score.go @@ -3,7 +3,6 @@ package ent import ( - "ent/ent/score" "fmt" "strings" "time" @@ -11,6 +10,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" ) // Score is the model entity for the Score schema. diff --git a/typing-server/domain/repository/ent/score/where.go b/typing-server/domain/repository/ent/score/where.go index 6c162ef..2ba1440 100644 --- a/typing-server/domain/repository/ent/score/where.go +++ b/typing-server/domain/repository/ent/score/where.go @@ -3,11 +3,11 @@ package score import ( - "ent/ent/predicate" "time" "entgo.io/ent/dialect/sql" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/typing-server/domain/repository/ent/score_create.go b/typing-server/domain/repository/ent/score_create.go index 77f2f33..c751671 100644 --- a/typing-server/domain/repository/ent/score_create.go +++ b/typing-server/domain/repository/ent/score_create.go @@ -4,7 +4,6 @@ package ent import ( "context" - "ent/ent/score" "errors" "fmt" "time" @@ -12,6 +11,7 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" ) // ScoreCreate is the builder for creating a Score entity. diff --git a/typing-server/domain/repository/ent/score_delete.go b/typing-server/domain/repository/ent/score_delete.go index 6300b18..3604337 100644 --- a/typing-server/domain/repository/ent/score_delete.go +++ b/typing-server/domain/repository/ent/score_delete.go @@ -4,12 +4,12 @@ package ent import ( "context" - "ent/ent/predicate" - "ent/ent/score" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" ) // ScoreDelete is the builder for deleting a Score entity. diff --git a/typing-server/domain/repository/ent/score_query.go b/typing-server/domain/repository/ent/score_query.go index f4120b7..f22149e 100644 --- a/typing-server/domain/repository/ent/score_query.go +++ b/typing-server/domain/repository/ent/score_query.go @@ -4,8 +4,6 @@ package ent import ( "context" - "ent/ent/predicate" - "ent/ent/score" "fmt" "math" @@ -13,6 +11,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" ) // ScoreQuery is the builder for querying Score entities. diff --git a/typing-server/domain/repository/ent/score_update.go b/typing-server/domain/repository/ent/score_update.go index 48c34ac..24047ff 100644 --- a/typing-server/domain/repository/ent/score_update.go +++ b/typing-server/domain/repository/ent/score_update.go @@ -4,8 +4,6 @@ package ent import ( "context" - "ent/ent/predicate" - "ent/ent/score" "errors" "fmt" "time" @@ -13,6 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" ) // ScoreUpdate is the builder for updating Score entities. diff --git a/typing-server/domain/repository/ent/user.go b/typing-server/domain/repository/ent/user.go index 688ad0e..9fc4f15 100644 --- a/typing-server/domain/repository/ent/user.go +++ b/typing-server/domain/repository/ent/user.go @@ -3,7 +3,6 @@ package ent import ( - "ent/ent/user" "fmt" "strings" "time" @@ -11,6 +10,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // User is the model entity for the User schema. diff --git a/typing-server/domain/repository/ent/user/where.go b/typing-server/domain/repository/ent/user/where.go index 4cfda93..092eb36 100644 --- a/typing-server/domain/repository/ent/user/where.go +++ b/typing-server/domain/repository/ent/user/where.go @@ -3,12 +3,12 @@ package user import ( - "ent/ent/predicate" "time" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/typing-server/domain/repository/ent/user_create.go b/typing-server/domain/repository/ent/user_create.go index db2dab5..657e776 100644 --- a/typing-server/domain/repository/ent/user_create.go +++ b/typing-server/domain/repository/ent/user_create.go @@ -4,8 +4,6 @@ package ent import ( "context" - "ent/ent/score" - "ent/ent/user" "errors" "fmt" "time" @@ -13,6 +11,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // UserCreate is the builder for creating a User entity. diff --git a/typing-server/domain/repository/ent/user_delete.go b/typing-server/domain/repository/ent/user_delete.go index 5106838..8b51d22 100644 --- a/typing-server/domain/repository/ent/user_delete.go +++ b/typing-server/domain/repository/ent/user_delete.go @@ -4,12 +4,12 @@ package ent import ( "context" - "ent/ent/predicate" - "ent/ent/user" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // UserDelete is the builder for deleting a User entity. diff --git a/typing-server/domain/repository/ent/user_query.go b/typing-server/domain/repository/ent/user_query.go index 555100c..486462e 100644 --- a/typing-server/domain/repository/ent/user_query.go +++ b/typing-server/domain/repository/ent/user_query.go @@ -5,9 +5,6 @@ package ent import ( "context" "database/sql/driver" - "ent/ent/predicate" - "ent/ent/score" - "ent/ent/user" "fmt" "math" @@ -15,6 +12,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // UserQuery is the builder for querying User entities. diff --git a/typing-server/domain/repository/ent/user_update.go b/typing-server/domain/repository/ent/user_update.go index 1baab47..9b94383 100644 --- a/typing-server/domain/repository/ent/user_update.go +++ b/typing-server/domain/repository/ent/user_update.go @@ -4,9 +4,6 @@ package ent import ( "context" - "ent/ent/predicate" - "ent/ent/score" - "ent/ent/user" "errors" "fmt" "time" @@ -15,6 +12,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" + "github.com/su-its/typing/typing-server/domain/repository/ent/predicate" + "github.com/su-its/typing/typing-server/domain/repository/ent/score" + "github.com/su-its/typing/typing-server/domain/repository/ent/user" ) // UserUpdate is the builder for updating User entities.