[bugfix] Fix existing perm adoption (#3651)

* [bugfix] Fix existing perm adoption

* go fmt

* test, small log fix

5 files changed, 17 insertions, 0 deletions

diff --git a/internal/gtsmodel/domainallow.go b/internal/gtsmodel/domainallow.go
index 7b947333b..3a7ca8774 100644
--- a/internal/gtsmodel/domainallow.go
+++ b/internal/gtsmodel/domainallow.go
@@ -104,3 +104,7 @@ func (d *DomainAllow) SetSubscriptionID(i string) {
 func (d *DomainAllow) GetType() DomainPermissionType {
 	return DomainPermissionAllow
 }
+
+func (d *DomainAllow) IsOrphan() bool {
+	return d.SubscriptionID == ""
+}
diff --git a/internal/gtsmodel/domainblock.go b/internal/gtsmodel/domainblock.go
index e99fea301..4a0e1c5b7 100644
--- a/internal/gtsmodel/domainblock.go
+++ b/internal/gtsmodel/domainblock.go
@@ -104,3 +104,7 @@ func (d *DomainBlock) SetSubscriptionID(i string) {
 func (d *DomainBlock) GetType() DomainPermissionType {
 	return DomainPermissionBlock
 }
+
+func (d *DomainBlock) IsOrphan() bool {
+	return d.SubscriptionID == ""
+}
diff --git a/internal/gtsmodel/domainpermission.go b/internal/gtsmodel/domainpermission.go
index f1db4de59..b08036a91 100644
--- a/internal/gtsmodel/domainpermission.go
+++ b/internal/gtsmodel/domainpermission.go
@@ -43,6 +43,10 @@ type DomainPermission interface {
 	GetSubscriptionID() string
 	SetSubscriptionID(i string)
 	GetType() DomainPermissionType
+
+	// Return true if this DomainPermission
+	// does not have a subscription id set.
+	IsOrphan() bool
 }
 
 // Domain permission type.
diff --git a/internal/gtsmodel/domainpermissiondraft.go b/internal/gtsmodel/domainpermissiondraft.go
index 0829dca16..d233df6f9 100644
--- a/internal/gtsmodel/domainpermissiondraft.go
+++ b/internal/gtsmodel/domainpermissiondraft.go
@@ -104,3 +104,7 @@ func (d *DomainPermissionDraft) SetSubscriptionID(i string) {
 func (d *DomainPermissionDraft) GetType() DomainPermissionType {
 	return d.PermissionType
 }
+
+func (d *DomainPermissionDraft) IsOrphan() bool {
+	return d.SubscriptionID == ""
+}
diff --git a/internal/gtsmodel/domainpermissionexclude.go b/internal/gtsmodel/domainpermissionexclude.go
index 2a0925ba7..10492a5c1 100644
--- a/internal/gtsmodel/domainpermissionexclude.go
+++ b/internal/gtsmodel/domainpermissionexclude.go
@@ -90,3 +90,4 @@ func (d *DomainPermissionExclude) SetObfuscate(_ *bool)          {}
 func (d *DomainPermissionExclude) GetSubscriptionID() string     { return "" }
 func (d *DomainPermissionExclude) SetSubscriptionID(_ string)    {}
 func (d *DomainPermissionExclude) GetType() DomainPermissionType { return DomainPermissionUnknown }
+func (d *DomainPermissionExclude) IsOrphan() bool                { return true }