more nullable fields

This commit is contained in:
crn4
2025-10-19 17:04:41 +02:00
parent af29a18a10
commit 5320c89bdd
+10 -6
View File
@@ -1030,11 +1030,7 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
} }
if resources != nil { if resources != nil {
_ = json.Unmarshal(resources, &g.Resources) _ = json.Unmarshal(resources, &g.Resources)
} else {
g.Resources = []types.Resource{}
} }
g.GroupPeers = []types.GroupPeer{}
g.Peers = []string{}
} }
return &g, err return &g, err
}) })
@@ -1305,15 +1301,23 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
go func() { go func() {
defer wg.Done() defer wg.Done()
const query = `SELECT account_id, onboarding_flow_pending, signup_form_pending, created_at, updated_at FROM account_onboardings WHERE account_id = $1` const query = `SELECT account_id, onboarding_flow_pending, signup_form_pending, created_at, updated_at FROM account_onboardings WHERE account_id = $1`
var onboardingFlowPending, signupFormPending sql.NullBool
err := s.pool.QueryRow(ctx, query, accountID).Scan( err := s.pool.QueryRow(ctx, query, accountID).Scan(
&account.Onboarding.AccountID, &account.Onboarding.AccountID,
&account.Onboarding.OnboardingFlowPending, &onboardingFlowPending,
&account.Onboarding.SignupFormPending, &signupFormPending,
&account.Onboarding.CreatedAt, &account.Onboarding.CreatedAt,
&account.Onboarding.UpdatedAt, &account.Onboarding.UpdatedAt,
) )
if err != nil && !errors.Is(err, pgx.ErrNoRows) { if err != nil && !errors.Is(err, pgx.ErrNoRows) {
errChan <- err errChan <- err
return
}
if onboardingFlowPending.Valid {
account.Onboarding.OnboardingFlowPending = onboardingFlowPending.Bool
}
if signupFormPending.Valid {
account.Onboarding.SignupFormPending = signupFormPending.Bool
} }
}() }()