From 4920229a3b6e1d7dde536bc9ff766542b05d935c Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 20 Aug 2021 12:26:56 +0200
Subject: Database updates (#144)

* start moving some database stuff around

* continue moving db stuff around

* more fiddling

* more updates

* and some more

* and yet more

* i broke SOMETHING but what, it's a mystery

* tidy up

* vendor ttlcache

* use ttlcache

* fix up some tests

* rename some stuff

* little reminder

* some more updates
---
 internal/gtsmodel/instance.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'internal/gtsmodel/instance.go')

diff --git a/internal/gtsmodel/instance.go b/internal/gtsmodel/instance.go
index 857831ba3..7b453a0b3 100644
--- a/internal/gtsmodel/instance.go
+++ b/internal/gtsmodel/instance.go
@@ -19,7 +19,8 @@ type Instance struct {
 	// When was this instance suspended, if at all?
 	SuspendedAt time.Time
 	// ID of any existing domain block for this instance in the database
-	DomainBlockID string `pg:"type:CHAR(26)"`
+	DomainBlockID string       `pg:"type:CHAR(26)"`
+	DomainBlock   *DomainBlock `pg:"rel:has-one"`
 	// Short description of this instance
 	ShortDescription string
 	// Longer description of this instance
@@ -31,7 +32,8 @@ type Instance struct {
 	// Username of the contact account for this instance
 	ContactAccountUsername string
 	// Contact account ID in the database for this instance
-	ContactAccountID string `pg:"type:CHAR(26)"`
+	ContactAccountID string   `pg:"type:CHAR(26)"`
+	ContactAccount   *Account `pg:"rel:has-one"`
 	// Reputation score of this instance
 	Reputation int64 `pg:",notnull,default:0"`
 	// Version of the software used on this instance
-- 
cgit v1.2.3