Move coredata outside probo service

Signed-off-by: gearnode <bryan@frimin.fr>

pkg/coredata/entity_type_reg.go

@@ -26,4 +26,6 @@ const (
 	PeopleEntityType
 	EvidenceStateTransitionEntityType
 	PolicyEntityType
+	UserEntityType
+	SessionEntityType
 )

pkg/crypto/passwdhash/passwdhash.go

@@ -12,7 +12,7 @@
 // OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-package usrmgr
+package passwdhash
 
 import (
 	"crypto/hmac"
@@ -26,7 +26,7 @@ import (
 )
 
 type (
-	HashingProfile struct {
+	Profile struct {
 		minIterations uint
 		saltLength    uint
 		keyLength     uint
@@ -39,7 +39,7 @@ const (
 	algorithmByte = 0x01 // Algorithm identifier (0x01 for PBKDF2-SHA256)
 )
 
-func NewHashingProfile(pepper []byte) (*HashingProfile, error) {
+func NewProfile(pepper []byte) (*Profile, error) {
 	if len(pepper) < 32 {
 		return nil, fmt.Errorf("pepper must be at least 32 bytes")
 	}
@@ -48,7 +48,7 @@ func NewHashingProfile(pepper []byte) (*HashingProfile, error) {
 	// - At least 32 bits of salt (we use 256 bits/32 bytes for extra security)
 	// - At least 1000 iterations (we use higher based on processing capabilities)
 	// - Resulting key length should be at least 160 bits (we use 256 bits)
-	return &HashingProfile{
+	return &Profile{
 		minIterations: 600000, // Minimum iterations (adjusted based on hardware speed)
 		saltLength:    32,     // Salt length in bytes (256 bits)
 		keyLength:     32,     // Output key length in bytes (256 bits)
@@ -56,13 +56,13 @@ func NewHashingProfile(pepper []byte) (*HashingProfile, error) {
 	}, nil
 }
 
-func (hp HashingProfile) applyPepper(input []byte) []byte {
+func (hp Profile) applyPepper(input []byte) []byte {
 	mac := hmac.New(sha256.New, hp.pepper)
 	mac.Write(input)
 	return mac.Sum(nil)
 }
 
-func (hp HashingProfile) HashPassword(password []byte, iterations uint32) ([]byte, error) {
+func (hp Profile) HashPassword(password []byte, iterations uint32) ([]byte, error) {
 	salt := make([]byte, hp.saltLength)
 	if _, err := rand.Read(salt); err != nil {
 		return nil, fmt.Errorf("error generating salt: %v", err)
@@ -94,7 +94,7 @@ func (hp HashingProfile) HashPassword(password []byte, iterations uint32) ([]byt
 	return binaryHash, nil
 }
 
-func (hp HashingProfile) ComparePasswordAndHash(password, passwordHash []byte) (bool, error) {
+func (hp Profile) ComparePasswordAndHash(password, passwordHash []byte) (bool, error) {
 	if len(passwordHash) < 7 {
 		return false, fmt.Errorf("hash too short")
 	}

pkg/probo/create_control.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/create_evidence.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/crypto/uuid"
 	"go.gearno.de/kit/pg"
 )

pkg/probo/create_framework.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/create_organization.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/create_people.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/create_task.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/create_vendor.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/delete_evidence.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/delete_framework.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/delete_people.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/delete_task.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/delete_vendor.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_control.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_evidence.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_framework.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_organization.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_people.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_task.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/get_vendor.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/list_control_tasks.go

@@ -17,9 +17,9 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/list_framework_controls.go

@@ -17,9 +17,9 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/list_organization_frameworks.go

@@ -17,9 +17,9 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/list_organization_peoples.go

@@ -17,9 +17,9 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/list_organization_vendors.go

@@ -17,9 +17,9 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/list_task_evidences.go

@@ -17,9 +17,9 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/policy_service.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/service.go

@@ -19,9 +19,8 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
-	"go.gearno.de/kit/migrator"
 	"go.gearno.de/kit/pg"
 )
 
@@ -42,11 +41,6 @@ func NewService(
 	s3Client *s3.Client,
 	bucket string,
 ) (*Service, error) {
-	err := migrator.NewMigrator(pgClient, coredata.Migrations).Run(ctx, "migrations")
-	if err != nil {
-		return nil, fmt.Errorf("cannot migrate database schema: %w", err)
-	}
-
 	if bucket == "" {
 		return nil, fmt.Errorf("bucket is required")
 	}

pkg/probo/update_control.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/update_framework.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/update_people.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/update_task.go

@@ -17,8 +17,8 @@ package probo
 import (
 	"context"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probo/update_vendor.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
-	"github.com/getprobo/probo/pkg/probo/coredata"
 	"go.gearno.de/kit/pg"
 )
 

pkg/probod/probod.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/getprobo/probo/pkg/awsconfig"
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/probo"
 	"github.com/getprobo/probo/pkg/server"
 	console_v1 "github.com/getprobo/probo/pkg/server/api/console/v1"
@@ -33,6 +34,7 @@ import (
 	"go.gearno.de/kit/httpclient"
 	"go.gearno.de/kit/httpserver"
 	"go.gearno.de/kit/log"
+	"go.gearno.de/kit/migrator"
 	"go.gearno.de/kit/pg"
 	"go.gearno.de/kit/unit"
 	"go.opentelemetry.io/otel/trace"
@@ -146,7 +148,11 @@ func (impl *Implm) Run(
 
 	s3Client := s3.NewFromConfig(awsConfig)
 
-	// TODO: merge usrmgr and probo service
+	err = migrator.NewMigrator(pgClient, coredata.Migrations).Run(ctx, "migrations")
+	if err != nil {
+		return fmt.Errorf("cannot migrate database schema: %w", err)
+	}
+
 	usrmgrService, err := usrmgr.NewService(ctx, pgClient, pepper)
 	if err != nil {
 		return fmt.Errorf("cannot create usrmgr service: %w", err)

pkg/server/api/console/v1/resolver.go

@@ -27,11 +27,11 @@ import (
 	"github.com/99designs/gqlgen/graphql/handler/extension"
 	"github.com/99designs/gqlgen/graphql/handler/transport"
 	"github.com/99designs/gqlgen/graphql/playground"
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/probo"
 	"github.com/getprobo/probo/pkg/server/api/console/v1/schema"
 	"github.com/getprobo/probo/pkg/usrmgr"
-	"github.com/getprobo/probo/pkg/usrmgr/coredata"
 	"github.com/go-chi/chi/v5"
 	"github.com/vektah/gqlparser/v2/gqlerror"
 )

pkg/server/api/console/v1/schema.graphql

@@ -21,60 +21,52 @@ interface Node {
 }
 
 enum ControlState
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.ControlState") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.ControlState") {
   NOT_STARTED
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateNotStarted"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateNotStarted"
     )
   IN_PROGRESS
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateInProgress"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateInProgress"
     )
   NOT_APPLICABLE
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateNotApplicable"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateNotApplicable"
     )
   IMPLEMENTED
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateImplemented"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateImplemented"
     )
 }
 
 enum TaskState
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.TaskState") {
-  TODO
-    @goEnum(value: "github.com/getprobo/probo/pkg/probo/coredata.TaskStateTodo")
-  DONE
-    @goEnum(value: "github.com/getprobo/probo/pkg/probo/coredata.TaskStateDone")
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.TaskState") {
+  TODO @goEnum(value: "github.com/getprobo/probo/pkg/coredata.TaskStateTodo")
+  DONE @goEnum(value: "github.com/getprobo/probo/pkg/coredata.TaskStateDone")
 }
 
 enum EvidenceState
-  @goModel(
-    model: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceState"
-  ) {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.EvidenceState") {
   VALID
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceStateValid"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.EvidenceStateValid")
   INVALID
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceStateInvalid"
+      value: "github.com/getprobo/probo/pkg/coredata.EvidenceStateInvalid"
     )
   EXPIRED
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceStateExpired"
+      value: "github.com/getprobo/probo/pkg/coredata.EvidenceStateExpired"
     )
 }
 
 enum PeopleKind
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.PeopleKind") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.PeopleKind") {
   EMPLOYEE
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PeopleKindEmployee"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.PeopleKindEmployee")
   CONTRACTOR
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PeopleKindContractor"
+      value: "github.com/getprobo/probo/pkg/coredata.PeopleKindContractor"
     )
 }
 
@@ -378,37 +370,29 @@ input UpdatePeopleInput {
 }
 
 enum ServiceCriticality
-  @goModel(
-    model: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticality"
-  ) {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.ServiceCriticality") {
   LOW
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticalityLow"
+      value: "github.com/getprobo/probo/pkg/coredata.ServiceCriticalityLow"
     )
   MEDIUM
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticalityMedium"
+      value: "github.com/getprobo/probo/pkg/coredata.ServiceCriticalityMedium"
     )
   HIGH
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticalityHigh"
+      value: "github.com/getprobo/probo/pkg/coredata.ServiceCriticalityHigh"
     )
 }
 
 enum RiskTier
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.RiskTier") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.RiskTier") {
   CRITICAL
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.RiskTierCritical"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.RiskTierCritical")
   SIGNIFICANT
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.RiskTierSignificant"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.RiskTierSignificant")
   GENERAL
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.RiskTierGeneral"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.RiskTierGeneral")
 }
 
 input UpdateVendorInput {
@@ -547,15 +531,11 @@ type DeleteEvidencePayload {
 }
 
 enum PolicyStatus
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.PolicyStatus") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.PolicyStatus") {
   DRAFT
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PolicyStatusDraft"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.PolicyStatusDraft")
   ACTIVE
-    @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PolicyStatusActive"
-    )
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.PolicyStatusActive")
 }
 
 input CreatePolicyInput {

pkg/server/api/console/v1/schema/schema.go

@@ -16,7 +16,7 @@ import (
 	"github.com/99designs/gqlgen/graphql/introspection"
 	"github.com/getprobo/probo/pkg/gid"
 	"github.com/getprobo/probo/pkg/page"
-	"github.com/getprobo/probo/pkg/probo/coredata"
+	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/server/api/console/v1/types"
 	gqlparser "github.com/vektah/gqlparser/v2"
 	"github.com/vektah/gqlparser/v2/ast"
@@ -1824,60 +1824,60 @@ interface Node {
 }
 
 enum ControlState
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.ControlState") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.ControlState") {
   NOT_STARTED
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateNotStarted"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateNotStarted"
     )
   IN_PROGRESS
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateInProgress"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateInProgress"
     )
   NOT_APPLICABLE
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateNotApplicable"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateNotApplicable"
     )
   IMPLEMENTED
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ControlStateImplemented"
+      value: "github.com/getprobo/probo/pkg/coredata.ControlStateImplemented"
     )
 }
 
 enum TaskState
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.TaskState") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.TaskState") {
   TODO
-    @goEnum(value: "github.com/getprobo/probo/pkg/probo/coredata.TaskStateTodo")
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.TaskStateTodo")
   DONE
-    @goEnum(value: "github.com/getprobo/probo/pkg/probo/coredata.TaskStateDone")
+    @goEnum(value: "github.com/getprobo/probo/pkg/coredata.TaskStateDone")
 }
 
 enum EvidenceState
   @goModel(
-    model: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceState"
+    model: "github.com/getprobo/probo/pkg/coredata.EvidenceState"
   ) {
   VALID
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceStateValid"
+      value: "github.com/getprobo/probo/pkg/coredata.EvidenceStateValid"
     )
   INVALID
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceStateInvalid"
+      value: "github.com/getprobo/probo/pkg/coredata.EvidenceStateInvalid"
     )
   EXPIRED
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.EvidenceStateExpired"
+      value: "github.com/getprobo/probo/pkg/coredata.EvidenceStateExpired"
     )
 }
 
 enum PeopleKind
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.PeopleKind") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.PeopleKind") {
   EMPLOYEE
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PeopleKindEmployee"
+      value: "github.com/getprobo/probo/pkg/coredata.PeopleKindEmployee"
     )
   CONTRACTOR
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PeopleKindContractor"
+      value: "github.com/getprobo/probo/pkg/coredata.PeopleKindContractor"
     )
 }
 
@@ -2182,35 +2182,35 @@ input UpdatePeopleInput {
 
 enum ServiceCriticality
   @goModel(
-    model: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticality"
+    model: "github.com/getprobo/probo/pkg/coredata.ServiceCriticality"
   ) {
   LOW
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticalityLow"
+      value: "github.com/getprobo/probo/pkg/coredata.ServiceCriticalityLow"
     )
   MEDIUM
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticalityMedium"
+      value: "github.com/getprobo/probo/pkg/coredata.ServiceCriticalityMedium"
     )
   HIGH
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.ServiceCriticalityHigh"
+      value: "github.com/getprobo/probo/pkg/coredata.ServiceCriticalityHigh"
     )
 }
 
 enum RiskTier
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.RiskTier") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.RiskTier") {
   CRITICAL
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.RiskTierCritical"
+      value: "github.com/getprobo/probo/pkg/coredata.RiskTierCritical"
     )
   SIGNIFICANT
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.RiskTierSignificant"
+      value: "github.com/getprobo/probo/pkg/coredata.RiskTierSignificant"
     )
   GENERAL
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.RiskTierGeneral"
+      value: "github.com/getprobo/probo/pkg/coredata.RiskTierGeneral"
     )
 }
 
@@ -2350,14 +2350,14 @@ type DeleteEvidencePayload {
 }
 
 enum PolicyStatus
-  @goModel(model: "github.com/getprobo/probo/pkg/probo/coredata.PolicyStatus") {
+  @goModel(model: "github.com/getprobo/probo/pkg/coredata.PolicyStatus") {
   DRAFT
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PolicyStatusDraft"
+      value: "github.com/getprobo/probo/pkg/coredata.PolicyStatusDraft"
     )
   ACTIVE
     @goEnum(
-      value: "github.com/getprobo/probo/pkg/probo/coredata.PolicyStatusActive"
+      value: "github.com/getprobo/probo/pkg/coredata.PolicyStatusActive"
     )
 }