feat: improve edge usages

penguin-statistics · Aug 28, 2023 · 6ed7b5f · 6ed7b5f
1 parent 6ee0a97
commit 6ed7b5f
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 35 deletions.
diff --git a/cmd/app/cli/script/import_util.go b/cmd/app/cli/script/import_util.go
@@ -27,20 +27,20 @@ func ReadCSVFile(filePath string) [][]string {
 func PostEvent(content map[string]any, researchID string) {
 	client := graphql.NewClient("http://localhost:3500/graphql")
 	req := graphql.NewRequest(`
-	mutation CreateEvent($newEvent: NewEvent!) {
-		createEvent(input: $newEvent) {
+	mutation CreateEvent($input: CreateEventInput!) {
+		createEvent(input: $input) {
 		  content
 		}
 	  }`,
 	)
 	userAgent := "cli"
-	newEvent := model.CreateEventInput{
+	input := model.CreateEventInput{
 		Content:    content,
 		ResearchID: researchID,
 		UserAgent:  userAgent,
 	}
-	req.Var("newEvent", newEvent)
-	// req.Header.Set("Authorization", "")
+	req.Var("input", input)
+	req.Header.Set("Authorization", "Bearer eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJyb2d1ZXN0YXRzIiwiZXhwIjoxNjk0MjA0MjY1LCJpYXQiOjE2OTI5OTQ2NjUsImlzcyI6InJvZ3Vlc3RhdHMvdjAuMC4wIiwibmJmIjoxNjkyOTk0NjY1LCJzdWIiOiIwMWg4cTVlYnJuNWV0aG0xcDZ6anhyOWVmdyJ9.AHlIYrx7tKj6nnXO4MYRd_0mXqzOVWPyG6FHidPitfI2IbrtZI3-lXA-bZP_nl0Op7d4TgzacdYwJPDgYGLoZcznAfopT-ahoHmDZrflhrK-Soo8ji7OZENjOIH5VetkkTaKl9zuqdAivds4DQPefSYngsn5vqzIgIZhaoR8nJoaq6MT")
 	ctx := context.Background()
 	var respData any
 	if err := client.Run(ctx, req, &respData); err != nil {

diff --git a/internal/ent/event.go b/internal/ent/event.go
diff --git a/internal/ent/event/event.go b/internal/ent/event/event.go
diff --git a/internal/ent/event_create.go b/internal/ent/event_create.go
diff --git a/internal/ent/event_query.go b/internal/ent/event_query.go
diff --git a/internal/ent/migrate/schema.go b/internal/ent/migrate/schema.go
diff --git a/internal/ent/research/research.go b/internal/ent/research/research.go
diff --git a/internal/ent/research_query.go b/internal/ent/research_query.go
diff --git a/internal/ent/schema/event.go b/internal/ent/schema/event.go
@@ -28,9 +28,14 @@ func (Event) Fields() []ent.Field {
 			Annotations(
 				entgql.OrderField("ID"),
 			),
-		field.Time("created_at").Immutable().Default(time.Now).Annotations(
-			entgql.OrderField("CREATED_AT"),
-		),
+		field.Time("created_at").
+			Immutable().
+			Default(time.Now).
+			Annotations(
+				entgql.OrderField("CREATED_AT"),
+			),
+		field.String("user_id"),
+		field.String("research_id"),
 		field.String("user_agent"),
 		field.JSON("content", map[string]any{}),
 	}
@@ -41,8 +46,14 @@ func (Event) Edges() []ent.Edge {
 	return []ent.Edge{
 		edge.From("user", User.Type).
 			Ref("events").
+			Field("user_id").
+			Required().
+			Unique(),
+		edge.From("research", Research.Type).
+			Ref("events").
+			Field("research_id").
+			Required().
 			Unique(),
-		edge.From("research", Research.Type).Ref("events").Unique(),
 	}
 }
 

diff --git a/internal/ent/schema/research.go b/internal/ent/schema/research.go
@@ -36,8 +36,7 @@ func (Research) Fields() []ent.Field {
 func (Research) Edges() []ent.Edge {
 	return []ent.Edge{
 		edge.To("events", Event.Type).
-			Required().
-			StorageKey(edge.Column("research_id")).
+			// Required().
 			Annotations(entsql.OnDelete(entsql.NoAction)),
 	}
 }

diff --git a/internal/ent/schema/user.go b/internal/ent/schema/user.go
@@ -34,8 +34,7 @@ func (User) Fields() []ent.Field {
 func (User) Edges() []ent.Edge {
 	return []ent.Edge{
 		edge.To("events", Event.Type).
-			Required().
-			StorageKey(edge.Column("user_id")).
+			// Required().
 			Annotations(entsql.OnDelete(entsql.NoAction)),
 	}
 }

diff --git a/internal/ent/user/user.go b/internal/ent/user/user.go
diff --git a/internal/ent/user_query.go b/internal/ent/user_query.go