Merge pull request #71 from deso-protocol/begin-add-relations-to-types

Begin adding relations for types

Author: superzordon

entries/access_group.go

@@ -13,8 +13,10 @@ type AccessGroupEntry struct {
 	AccessGroupKeyName        string `pg:",use_zero"`
 	AccessGroupPublicKey      string `bun:",nullzero"`
 
+	AccessGroupMembers []*PGAccessGroupMemberEntry `bun:"rel:has-many,join:access_group_owner_public_key=access_group_owner_public_key,join:access_group_key_name=access_group_key_name"`
+
 	ExtraData map[string]string `bun:"type:jsonb"`
-	BadgerKey []byte            `pg:",pk,use_zero"`
+	BadgerKey []byte            `bun:",pk" pg:",pk,use_zero"`
 }
 
 type PGAccessGroupEntry struct {

entries/access_group_member.go

@@ -16,8 +16,12 @@ type AccessGroupMemberEntry struct {
 
 	EncryptedKey []byte `pg:",use_zero"`
 
+	AccessGroupMemberAccount *PGAccount          `bun:"rel:belongs-to,join:access_group_member_public_key=public_key"`
+	AccessGroupOwnerAccount  *PGAccount          `bun:"rel:belongs-to,join:access_group_owner_public_key=public_key"`
+	AccessGroup              *PGAccessGroupEntry `bun:"rel:belongs-to,join:access_group_owner_public_key=access_group_owner_public_key,join:access_group_key_name=access_group_key_name"`
+
 	ExtraData map[string]string `bun:"type:jsonb"`
-	BadgerKey []byte            `pg:",pk,use_zero"`
+	BadgerKey []byte            `bun:",pk" pg:",pk,use_zero"`
 }
 
 type PGAccessGroupMemberEntry struct {

entries/account.go

@@ -0,0 +1,24 @@
+package entries
+
+import "github.com/uptrace/bun"
+
+type PGAccount struct {
+	bun.BaseModel `bun:"table:account"`
+
+	Pkid                   string `bun:"pkid,pk"` // We make Pkid the primary key so that bun is happy.
+	PublicKey              string `bun:"public_key"`
+	Username               string `bun:"username"`
+	Description            string `bun:"description"`
+	ProfilePic             string `bun:"profile_pic"`
+	CreatorBasisPoints     uint64 `bun:"creator_basis_points"`
+	CoinWatermarkNanos     uint64 `bun:"coin_watermark_nanos"`
+	MintingDisabled        bool   `bun:"minting_disabled"`
+	DaoCoinMintingDisabled bool   `bun:"dao_coin_minting_disabled"`
+	// TODO: bun seems to have a limit to the length of the string it can store in a column name.
+	//DaoCoinTransferRestrictionStatus string                 `bun:"dao_coin_transfer_restriction_status"`
+	ExtraData                 map[string]interface{} `bun:"extra_data"`
+	CoinPriceDeSoNanos        uint64                 `bun:"coin_price_deso_nanos"`
+	DeSoLockedNanos           uint64                 `bun:"deso_locked_nanos"`
+	CCCoinsInCirculationNanos uint64                 `bun:"cc_coins_in_circulation_nanos"`
+	//DAOCoinsInCirculationNanosHex uint64                 `bun:"dao_coins_in_circulation_nanos_hex"`
+}

entries/user_association.go

@@ -18,8 +18,12 @@ type UserAssociationEntry struct {
 	AssociationValue string `pg:",use_zero"`
 	BlockHeight      uint32 `bun:",nullzero"`
 
+	TransactorUser PGAccount `bun:"rel:belongs-to,join:transactor_pkid=pkid"`
+	TargetUser     PGAccount `bun:"rel:belongs-to,join:target_user_pkid=pkid"`
+	AppUser        PGAccount `bun:"rel:belongs-to,join:app_pkid=pkid"`
+
 	ExtraData map[string]string `bun:"type:jsonb"`
-	BadgerKey []byte            `pg:",pk,use_zero"`
+	BadgerKey []byte            `bun:",pk" pg:",pk,use_zero"`
 }
 
 type PGUserAssociationEntry struct {

main.go

@@ -55,7 +55,7 @@ func main() {
 	// Setup profiler if enabled.
 	if datadogProfiler {
 		tracer.Start()
-		err := profiler.Start(profiler.WithProfileTypes(profiler.CPUProfile, profiler.BlockProfile, profiler.MutexProfile, profiler.GoroutineProfile, profiler.HeapProfile))
+		err = profiler.Start(profiler.WithProfileTypes(profiler.CPUProfile, profiler.BlockProfile, profiler.MutexProfile, profiler.GoroutineProfile, profiler.HeapProfile))
 		if err != nil {
 			glog.Fatal(err)
 		}