instance custom domain event tests done

backend/v3/domain/domain.go

@@ -13,6 +13,13 @@ const (
 	DomainValidationTypeHTTP DomainValidationType = "http"
 )
 
+type DomainType string
+
+const (
+	DomainTypeCustom  DomainType = "custom"
+	DomainTypeTrusted DomainType = "trusted"
+)
+
 type domainColumns interface {
 	// InstanceIDColumn returns the column for the instance id field.
 	// `qualified` indicates if the column should be qualified with the table name.
@@ -20,15 +27,9 @@ type domainColumns interface {
 	// DomainColumn returns the column for the domain field.
 	// `qualified` indicates if the column should be qualified with the table name.
 	DomainColumn(qualified bool) database.Column
-	// IsVerifiedColumn returns the column for the is verified field.
-	// `qualified` indicates if the column should be qualified with the table name.
-	IsVerifiedColumn(qualified bool) database.Column
 	// IsPrimaryColumn returns the column for the is primary field.
 	// `qualified` indicates if the column should be qualified with the table name.
 	IsPrimaryColumn(qualified bool) database.Column
-	// ValidationTypeColumn returns the column for the verification type field.
-	// `qualified` indicates if the column should be qualified with the table name.
-	ValidationTypeColumn(qualified bool) database.Column
 	// CreatedAtColumn returns the column for the created at field.
 	// `qualified` indicates if the column should be qualified with the table name.
 	CreatedAtColumn(qualified bool) database.Column
@@ -44,13 +45,9 @@ type domainConditions interface {
 	DomainCondition(op database.TextOperation, domain string) database.Condition
 	// IsPrimaryCondition returns a filter on the is primary field.
 	IsPrimaryCondition(isPrimary bool) database.Condition
-	// IsVerifiedCondition returns a filter on the is verified field.
-	IsVerifiedCondition(isVerified bool) database.Condition
 }
 
 type domainChanges interface {
-	// SetVerified sets the is verified column to true.
-	SetVerified() database.Change
 	// SetPrimary sets a domain as primary based on the condition.
 	// All other domains will be set to non-primary.
 	//
@@ -62,9 +59,6 @@ type domainChanges interface {
 	// - The domain is already primary.
 	// - No domain matches the condition.
 	SetPrimary() database.Change
-	// SetValidationType sets the verification type column.
-	// If the domain is already verified, this is a no-op.
-	SetValidationType(verificationType DomainValidationType) database.Change
 	// SetUpdatedAt sets the updated at column.
 	// This is used for reducing events.
 	SetUpdatedAt(t time.Time) database.Change

backend/v3/domain/instance_domain.go

@@ -8,30 +8,28 @@ import (
 )
 
 type InstanceDomain struct {
-	InstanceID     string                `json:"instanceId,omitempty" db:"instance_id"`
-	Domain         string                `json:"domain,omitempty" db:"domain"`
-	IsVerified     bool                  `json:"isVerified,omitempty" db:"is_verified"`
-	IsPrimary      bool                  `json:"isPrimary,omitempty" db:"is_primary"`
-	ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
+	InstanceID string     `json:"instanceId,omitempty" db:"instance_id"`
+	Domain     string     `json:"domain,omitempty" db:"domain"`
+	IsPrimary  bool       `json:"isPrimary,omitempty" db:"is_primary"`
+	Type       DomainType `json:"type,omitempty" db:"type"`
 
 	CreatedAt time.Time `json:"createdAt,omitzero" db:"created_at"`
 	UpdatedAt time.Time `json:"updatedAt,omitzero" db:"updated_at"`
 }
 
 type AddInstanceDomain struct {
-	InstanceID     string                `json:"instanceId,omitempty" db:"instance_id"`
-	Domain         string                `json:"domain,omitempty" db:"domain"`
-	IsVerified     bool                  `json:"isVerified,omitempty" db:"is_verified"`
-	IsPrimary      bool                  `json:"isPrimary,omitempty" db:"is_primary"`
-	IsGenerated    bool                  `json:"isGenerated,omitempty" db:"is_generated"`
-	ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
+	InstanceID  string     `json:"instanceId,omitempty" db:"instance_id"`
+	Domain      string     `json:"domain,omitempty" db:"domain"`
+	IsPrimary   bool       `json:"isPrimary,omitempty" db:"is_primary"`
+	IsGenerated bool       `json:"isGenerated,omitempty" db:"is_generated"`
+	Type        DomainType `json:"type,omitempty" db:"type"`
 
 	// CreatedAt is the time when the domain was added.
 	// It is set by the repository and should not be set by the caller.
-	CreatedAt time.Time `json:"createdAt,omitzero" db:"created_at"`
+	CreatedAt *time.Time `json:"createdAt,omitzero" db:"created_at"`
 	// UpdatedAt is the time when the domain was last updated.
 	// It is set by the repository and should not be set by the caller.
-	UpdatedAt time.Time `json:"updatedAt,omitzero" db:"updated_at"`
+	UpdatedAt *time.Time `json:"updatedAt,omitzero" db:"updated_at"`
 }
 
 type instanceDomainColumns interface {
@@ -39,14 +37,21 @@ type instanceDomainColumns interface {
 	// IsGeneratedColumn returns the column for the is generated field.
 	// `qualified` indicates if the column should be qualified with the table name.
 	IsGeneratedColumn(qualified bool) database.Column
+	// TypeColumn returns the column for the type field.
+	// `qualified` indicates if the column should be qualified with the table name.
+	TypeColumn(qualified bool) database.Column
 }
 
 type instanceDomainConditions interface {
 	domainConditions
+	// TypeCondition returns a filter for the type field.
+	TypeCondition(typ DomainType) database.Condition
 }
 
 type instanceDomainChanges interface {
 	domainChanges
+	// SetType sets the type column.
+	SetType(typ DomainType) database.Change
 }
 
 type InstanceDomainRepository interface {

backend/v3/domain/organization_domain.go

@@ -38,17 +38,31 @@ type AddOrganizationDomain struct {
 type organizationDomainColumns interface {
 	domainColumns
 	// OrgIDColumn returns the column for the org id field.
+	// `qualified` indicates if the column should be qualified with the table name.
 	OrgIDColumn(qualified bool) database.Column
+	// IsVerifiedColumn returns the column for the is verified field.
+	// `qualified` indicates if the column should be qualified with the table name.
+	IsVerifiedColumn(qualified bool) database.Column
+	// ValidationTypeColumn returns the column for the verification type field.
+	// `qualified` indicates if the column should be qualified with the table name.
+	ValidationTypeColumn(qualified bool) database.Column
 }
 
 type organizationDomainConditions interface {
 	domainConditions
 	// OrgIDCondition returns a filter on the org id field.
 	OrgIDCondition(orgID string) database.Condition
+	// IsVerifiedCondition returns a filter on the is verified field.
+	IsVerifiedCondition(isVerified bool) database.Condition
 }
 
 type organizationDomainChanges interface {
 	domainChanges
+	// SetVerified sets the is verified column to true.
+	SetVerified() database.Change
+	// SetValidationType sets the verification type column.
+	// If the domain is already verified, this is a no-op.
+	SetValidationType(verificationType DomainValidationType) database.Change
 }
 
 type OrganizationDomainRepository interface {