Bascule sur l'ORM GORM

- On n'utilise plus la pattern CQRS trop lourde pour le système
- Un système de models/repository "à la Symfony" est utilisé pour les
  requêtes

internal/graph/helper.go

@@ -0,0 +1,25 @@
+package graph
+
+import (
+	"context"
+
+	"forge.cadoles.com/Cadoles/daddy/internal/orm"
+	"github.com/jinzhu/gorm"
+
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/middleware/container"
+)
+
+func getDB(ctx context.Context) (*gorm.DB, error) {
+	ctn, err := container.From(ctx)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	orm, err := orm.From(ctn)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	return orm.DB(), nil
+}

internal/graph/model/models_gen.go

@@ -1,14 +0,0 @@
-// Code generated by github.com/99designs/gqlgen, DO NOT EDIT.
-
-package model
-
-import (
-	"time"
-)
-
-type User struct {
-	Name        *string   `json:"name"`
-	Email       string    `json:"email"`
-	ConnectedAt time.Time `json:"connectedAt"`
-	CreatedAt   time.Time `json:"createdAt"`
-}

internal/graph/mutation.graphql

@@ -0,0 +1,7 @@
+input ProfileChanges {
+  name: String
+}
+
+type Mutation {
+  updateProfile(changes: ProfileChanges!): User!
+}

internal/graph/mutation.resolvers.go

@@ -0,0 +1,20 @@
+package graph
+
+// This file will be automatically regenerated based on the schema, any resolver implementations
+// will be copied through when generating and any unknown code will be moved to the end.
+
+import (
+	"context"
+
+	"forge.cadoles.com/Cadoles/daddy/internal/graph/generated"
+	"forge.cadoles.com/Cadoles/daddy/internal/model"
+)
+
+func (r *mutationResolver) UpdateProfile(ctx context.Context, changes model.ProfileChanges) (*model.User, error) {
+	return handleUpdateUserProfile(ctx, changes)
+}
+
+// Mutation returns generated.MutationResolver implementation.
+func (r *Resolver) Mutation() generated.MutationResolver { return &mutationResolver{r} }
+
+type mutationResolver struct{ *Resolver }

internal/graph/query.graphql

@@ -1,7 +1,3 @@
-# GraphQL schema example
-#
-# https://gqlgen.com/getting-started/
-
 scalar Time
 
 type User {
@@ -13,4 +9,4 @@ type User {
 
 type Query {
   userProfile: User
-}
+}

internal/graph/query.resolvers.go

@@ -7,10 +7,10 @@ import (
 	"context"
 
 	"forge.cadoles.com/Cadoles/daddy/internal/graph/generated"
-	"forge.cadoles.com/Cadoles/daddy/internal/graph/model"
+	model1 "forge.cadoles.com/Cadoles/daddy/internal/model"
 )
 
-func (r *queryResolver) UserProfile(ctx context.Context) (*model.User, error) {
+func (r *queryResolver) UserProfile(ctx context.Context) (*model1.User, error) {
 	return handleUserProfile(ctx)
 }
 

internal/graph/resolver.go

@@ -4,4 +4,6 @@ package graph
 //
 // It serves as dependency injection for your app, add any dependencies you require here.
 
+//go:generate go run github.com/99designs/gqlgen
+
 type Resolver struct{}

internal/graph/user_profile.go

@@ -3,43 +3,33 @@ package graph
 import (
 	"context"
 
-	"forge.cadoles.com/Cadoles/daddy/internal/graph/model"
-	"forge.cadoles.com/Cadoles/daddy/internal/query"
 	"forge.cadoles.com/Cadoles/daddy/internal/session"
+
+	"forge.cadoles.com/Cadoles/daddy/internal/model"
 	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/cqrs"
-	"gitlab.com/wpetit/goweb/middleware/container"
 )
 
 func handleUserProfile(ctx context.Context) (*model.User, error) {
+	db, err := getDB(ctx)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
 	userEmail, err := session.UserEmail(ctx)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 
-	ctn, err := container.From(ctx)
+	repo := model.NewUserRepository(db)
+
+	user, err := repo.FindUserByEmail(ctx, userEmail)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 
-	dispatcher, err := cqrs.From(ctn)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	qry := &query.FindUserQueryRequest{
-		Email: userEmail,
-	}
-
-	result, err := dispatcher.Query(ctx, qry)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	findUserData, ok := result.Data().(*query.FindUserData)
-	if !ok {
-		return nil, errors.WithStack(cqrs.ErrUnexpectedData)
-	}
-
-	return findUserData.User, nil
+	return user, nil
+}
+
+func handleUpdateUserProfile(ctx context.Context, changes model.ProfileChanges) (*model.User, error) {
+	return nil, nil
 }