3 files changed, 7 insertions, 98 deletions

diff --git a/api/graphql/models/gen_models.go b/api/graphql/models/gen_models.go
index 5e2e1715..c4e40cba 100644
--- a/api/graphql/models/gen_models.go
+++ b/api/graphql/models/gen_models.go
@@ -3,11 +3,7 @@
 package models
 
 import (
-	"fmt"
-	"io"
-	"strconv"
-
-	"github.com/MichaelMure/git-bug/bug"
+	"github.com/MichaelMure/git-bug/entities/bug"
 	"github.com/MichaelMure/git-bug/entity/dag"
 	"github.com/MichaelMure/git-bug/repository"
 )
@@ -307,91 +303,3 @@ type TimelineItemEdge struct {
 	Cursor string           `json:"cursor"`
 	Node   bug.TimelineItem `json:"node"`
 }
-
-type LabelChangeStatus string
-
-const (
-	LabelChangeStatusAdded         LabelChangeStatus = "ADDED"
-	LabelChangeStatusRemoved       LabelChangeStatus = "REMOVED"
-	LabelChangeStatusDuplicateInOp LabelChangeStatus = "DUPLICATE_IN_OP"
-	LabelChangeStatusAlreadyExist  LabelChangeStatus = "ALREADY_EXIST"
-	LabelChangeStatusDoesntExist   LabelChangeStatus = "DOESNT_EXIST"
-)
-
-var AllLabelChangeStatus = []LabelChangeStatus{
-	LabelChangeStatusAdded,
-	LabelChangeStatusRemoved,
-	LabelChangeStatusDuplicateInOp,
-	LabelChangeStatusAlreadyExist,
-	LabelChangeStatusDoesntExist,
-}
-
-func (e LabelChangeStatus) IsValid() bool {
-	switch e {
-	case LabelChangeStatusAdded, LabelChangeStatusRemoved, LabelChangeStatusDuplicateInOp, LabelChangeStatusAlreadyExist, LabelChangeStatusDoesntExist:
-		return true
-	}
-	return false
-}
-
-func (e LabelChangeStatus) String() string {
-	return string(e)
-}
-
-func (e *LabelChangeStatus) UnmarshalGQL(v interface{}) error {
-	str, ok := v.(string)
-	if !ok {
-		return fmt.Errorf("enums must be strings")
-	}
-
-	*e = LabelChangeStatus(str)
-	if !e.IsValid() {
-		return fmt.Errorf("%s is not a valid LabelChangeStatus", str)
-	}
-	return nil
-}
-
-func (e LabelChangeStatus) MarshalGQL(w io.Writer) {
-	fmt.Fprint(w, strconv.Quote(e.String()))
-}
-
-type Status string
-
-const (
-	StatusOpen   Status = "OPEN"
-	StatusClosed Status = "CLOSED"
-)
-
-var AllStatus = []Status{
-	StatusOpen,
-	StatusClosed,
-}
-
-func (e Status) IsValid() bool {
-	switch e {
-	case StatusOpen, StatusClosed:
-		return true
-	}
-	return false
-}
-
-func (e Status) String() string {
-	return string(e)
-}
-
-func (e *Status) UnmarshalGQL(v interface{}) error {
-	str, ok := v.(string)
-	if !ok {
-		return fmt.Errorf("enums must be strings")
-	}
-
-	*e = Status(str)
-	if !e.IsValid() {
-		return fmt.Errorf("%s is not a valid Status", str)
-	}
-	return nil
-}
-
-func (e Status) MarshalGQL(w io.Writer) {
-	fmt.Fprint(w, strconv.Quote(e.String()))
-}
diff --git a/api/graphql/models/lazy_bug.go b/api/graphql/models/lazy_bug.go
index 092f2472..318fdc99 100644
--- a/api/graphql/models/lazy_bug.go
+++ b/api/graphql/models/lazy_bug.go
@@ -4,8 +4,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/entities/bug"
+	"github.com/MichaelMure/git-bug/entities/common"
 	"github.com/MichaelMure/git-bug/entity"
 	"github.com/MichaelMure/git-bug/entity/dag"
 )
@@ -16,7 +17,7 @@ import (
 type BugWrapper interface {
 	Id() entity.Id
 	LastEdit() time.Time
-	Status() bug.Status
+	Status() common.Status
 	Title() string
 	Comments() ([]bug.Comment, error)
 	Labels() []bug.Label
@@ -85,7 +86,7 @@ func (lb *lazyBug) LastEdit() time.Time {
 	return lb.excerpt.EditTime()
 }
 
-func (lb *lazyBug) Status() bug.Status {
+func (lb *lazyBug) Status() common.Status {
 	return lb.excerpt.Status
 }
 
@@ -167,7 +168,7 @@ func (l *loadedBug) LastEdit() time.Time {
 	return l.Snapshot.EditTime()
 }
 
-func (l *loadedBug) Status() bug.Status {
+func (l *loadedBug) Status() common.Status {
 	return l.Snapshot.Status
 }
 
diff --git a/api/graphql/models/lazy_identity.go b/api/graphql/models/lazy_identity.go
index 451bdd54..27bc9619 100644
--- a/api/graphql/models/lazy_identity.go
+++ b/api/graphql/models/lazy_identity.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/entities/identity"
 	"github.com/MichaelMure/git-bug/entity"
-	"github.com/MichaelMure/git-bug/identity"
 )
 
 // IdentityWrapper is an interface used by the GraphQL resolvers to handle an identity.