Skip to content

Commit c2defdb

Browse files
lakhansamanilakhansamani
committed
fix: refs for cassandra db
1 parent 15a4be5 commit c2defdb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+103
-255
lines changed

‎dashboard/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,9 +1222,9 @@
12221222
dependencies:
12231223
"is-arrayish" "^0.2.1"
12241224

1225-
"esbuild-linux-64@0.14.9":
1226-
"integrity" "sha512-WoEI+R6/PLZAxS7XagfQMFgRtLUi5cjqqU9VCfo3tnWmAXh/wt8QtUfCVVCcXVwZLS/RNvI19CtfjlrJU61nOg=="
1227-
"resolved" "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.9.tgz"
1225+
"esbuild-darwin-arm64@0.14.9":
1226+
"integrity" "sha512-3ue+1T4FR5TaAu4/V1eFMG8Uwn0pgAwQZb/WwL1X78d5Cy8wOVQ67KNH1lsjU+y/9AcwMKZ9x0GGNxBB4a1Rbw=="
1227+
"resolved" "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.9.tgz"
12281228
"version" "0.14.9"
12291229

12301230
"esbuild@^0.14.9":

‎server/db/providers/arangodb/email_template.go‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.E
1717
emailTemplate.ID = uuid.New().String()
1818
emailTemplate.Key = emailTemplate.ID
1919
}
20-
2120
emailTemplate.Key = emailTemplate.ID
2221
emailTemplate.CreatedAt = time.Now().Unix()
2322
emailTemplate.UpdatedAt = time.Now().Unix()
24-
2523
emailTemplateCollection, _ := p.db.Collection(ctx, models.Collections.EmailTemplate)
2624
_, err := emailTemplateCollection.CreateDocument(ctx, emailTemplate)
2725
if err != nil {
@@ -33,13 +31,11 @@ func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.E
3331
// UpdateEmailTemplate to update EmailTemplate
3432
func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
3533
emailTemplate.UpdatedAt = time.Now().Unix()
36-
3734
emailTemplateCollection, _ := p.db.Collection(ctx, models.Collections.EmailTemplate)
3835
meta, err := emailTemplateCollection.UpdateDocument(ctx, emailTemplate.Key, emailTemplate)
3936
if err != nil {
4037
return nil, err
4138
}
42-
4339
emailTemplate.Key = meta.Key
4440
emailTemplate.ID = meta.ID.String()
4541
return emailTemplate.AsAPIEmailTemplate(), nil
@@ -57,22 +53,18 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagi
5753
defer cursor.Close()
5854
paginationClone := pagination
5955
paginationClone.Total = cursor.Statistics().FullCount()
60-
6156
for {
6257
var emailTemplate *models.EmailTemplate
6358
meta, err := cursor.ReadDocument(ctx, &emailTemplate)
64-
6559
if arangoDriver.IsNoMoreDocuments(err) {
6660
break
6761
} else if err != nil {
6862
return nil, err
6963
}
70-
7164
if meta.Key != "" {
7265
emailTemplates = append(emailTemplates, emailTemplate.AsAPIEmailTemplate())
7366
}
7467
}
75-
7668
return &model.EmailTemplates{
7769
Pagination: paginationClone,
7870
EmailTemplates: emailTemplates,
@@ -86,16 +78,14 @@ func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID str
8678
bindVars := map[string]interface{}{
8779
"email_template_id": emailTemplateID,
8880
}
89-
9081
cursor, err := p.db.Query(ctx, query, bindVars)
9182
if err != nil {
9283
return nil, err
9384
}
9485
defer cursor.Close()
95-
9686
for {
9787
if !cursor.HasMore() {
98-
if emailTemplate.Key == "" {
88+
if emailTemplate == nil {
9989
return nil, fmt.Errorf("email template not found")
10090
}
10191
break
@@ -115,16 +105,14 @@ func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName st
115105
bindVars := map[string]interface{}{
116106
"event_name": eventName,
117107
}
118-
119108
cursor, err := p.db.Query(ctx, query, bindVars)
120109
if err != nil {
121110
return nil, err
122111
}
123112
defer cursor.Close()
124-
125113
for {
126114
if !cursor.HasMore() {
127-
if emailTemplate.Key == "" {
115+
if emailTemplate == nil {
128116
return nil, fmt.Errorf("email template not found")
129117
}
130118
break

‎server/db/providers/arangodb/env.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,14 @@ func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env,
4848
func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
4949
var env *models.Env
5050
query := fmt.Sprintf("FOR d in %s RETURN d", models.Collections.Env)
51-
5251
cursor, err := p.db.Query(ctx, query, nil)
5352
if err != nil {
5453
return env, err
5554
}
5655
defer cursor.Close()
57-
5856
for {
5957
if !cursor.HasMore() {
60-
if env.Key == "" {
58+
if env == nil {
6159
return env, fmt.Errorf("config not found")
6260
}
6361
break

‎server/db/providers/arangodb/otp.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,44 +44,38 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
4444
otp.Otp = otpParam.Otp
4545
otp.ExpiresAt = otpParam.ExpiresAt
4646
}
47-
4847
otp.UpdatedAt = time.Now().Unix()
4948
otpCollection, _ := p.db.Collection(ctx, models.Collections.OTP)
50-
5149
var meta driver.DocumentMeta
5250
var err error
5351
if shouldCreate {
5452
meta, err = otpCollection.CreateDocument(ctx, otp)
5553
} else {
5654
meta, err = otpCollection.UpdateDocument(ctx, otp.Key, otp)
5755
}
58-
5956
if err != nil {
6057
return nil, err
6158
}
62-
6359
otp.Key = meta.Key
6460
otp.ID = meta.ID.String()
6561
return otp, nil
6662
}
6763

6864
// GetOTPByEmail to get otp for a given email address
6965
func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
70-
var otp models.OTP
66+
var otp *models.OTP
7167
query := fmt.Sprintf("FOR d in %s FILTER d.email == @email RETURN d", models.Collections.OTP)
7268
bindVars := map[string]interface{}{
7369
"email": emailAddress,
7470
}
75-
7671
cursor, err := p.db.Query(ctx, query, bindVars)
7772
if err != nil {
7873
return nil, err
7974
}
8075
defer cursor.Close()
81-
8276
for {
8377
if !cursor.HasMore() {
84-
if otp.Key == "" {
78+
if otp == nil {
8579
return nil, fmt.Errorf("otp with given email not found")
8680
}
8781
break
@@ -91,13 +85,12 @@ func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*mod
9185
return nil, err
9286
}
9387
}
94-
95-
return &otp, nil
88+
return otp, nil
9689
}
9790

9891
// GetOTPByPhoneNumber to get otp for a given phone number
9992
func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string) (*models.OTP, error) {
100-
var otp models.OTP
93+
var otp *models.OTP
10194
query := fmt.Sprintf("FOR d in %s FILTER d.phone_number == @phone_number RETURN d", models.Collections.OTP)
10295
bindVars := map[string]interface{}{
10396
"phone_number": phoneNumber,
@@ -109,7 +102,7 @@ func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string)
109102
defer cursor.Close()
110103
for {
111104
if !cursor.HasMore() {
112-
if otp.Key == "" {
105+
if otp == nil {
113106
return nil, fmt.Errorf("otp with given phone_number not found")
114107
}
115108
break
@@ -119,8 +112,7 @@ func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string)
119112
return nil, err
120113
}
121114
}
122-
123-
return &otp, nil
115+
return otp, nil
124116
}
125117

126118
// DeleteOTP to delete otp
@@ -130,6 +122,5 @@ func (p *provider) DeleteOTP(ctx context.Context, otp *models.OTP) error {
130122
if err != nil {
131123
return err
132124
}
133-
134125
return nil
135126
}

‎server/db/providers/arangodb/provider.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func NewProvider() (*provider, error) {
6161
if err != nil {
6262
return nil, err
6363
}
64-
6564
var arangodb arangoDriver.Database
6665
dbName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseName
6766
arangodb_exists, err := arangoClient.DatabaseExists(ctx, dbName)
@@ -79,7 +78,6 @@ func NewProvider() (*provider, error) {
7978
return nil, err
8079
}
8180
}
82-
8381
userCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.User)
8482
if err != nil {
8583
return nil, err
@@ -113,7 +111,6 @@ func NewProvider() (*provider, error) {
113111
return nil, err
114112
}
115113
}
116-
117114
verificationRequestCollection, err := arangodb.Collection(ctx, models.Collections.VerificationRequest)
118115
if err != nil {
119116
return nil, err
@@ -136,15 +133,13 @@ func NewProvider() (*provider, error) {
136133
return nil, err
137134
}
138135
}
139-
140136
sessionCollection, err := arangodb.Collection(ctx, models.Collections.Session)
141137
if err != nil {
142138
return nil, err
143139
}
144140
sessionCollection.EnsureHashIndex(ctx, []string{"user_id"}, &arangoDriver.EnsureHashIndexOptions{
145141
Sparse: true,
146142
})
147-
148143
envCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Env)
149144
if err != nil {
150145
return nil, err
@@ -155,7 +150,6 @@ func NewProvider() (*provider, error) {
155150
return nil, err
156151
}
157152
}
158-
159153
webhookCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Webhook)
160154
if err != nil {
161155
return nil, err
@@ -166,7 +160,6 @@ func NewProvider() (*provider, error) {
166160
return nil, err
167161
}
168162
}
169-
170163
webhookCollection, err := arangodb.Collection(ctx, models.Collections.Webhook)
171164
if err != nil {
172165
return nil, err
@@ -186,15 +179,13 @@ func NewProvider() (*provider, error) {
186179
return nil, err
187180
}
188181
}
189-
190182
webhookLogCollection, err := arangodb.Collection(ctx, models.Collections.WebhookLog)
191183
if err != nil {
192184
return nil, err
193185
}
194186
webhookLogCollection.EnsureHashIndex(ctx, []string{"webhook_id"}, &arangoDriver.EnsureHashIndexOptions{
195187
Sparse: true,
196188
})
197-
198189
emailTemplateCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.EmailTemplate)
199190
if err != nil {
200191
return nil, err
@@ -205,7 +196,6 @@ func NewProvider() (*provider, error) {
205196
return nil, err
206197
}
207198
}
208-
209199
emailTemplateCollection, err := arangodb.Collection(ctx, models.Collections.EmailTemplate)
210200
if err != nil {
211201
return nil, err
@@ -214,7 +204,6 @@ func NewProvider() (*provider, error) {
214204
Unique: true,
215205
Sparse: true,
216206
})
217-
218207
otpCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.OTP)
219208
if err != nil {
220209
return nil, err

‎server/db/providers/arangodb/session.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ func (p *provider) AddSession(ctx context.Context, session *models.Session) erro
1414
session.ID = uuid.New().String()
1515
session.Key = session.ID
1616
}
17-
1817
session.CreatedAt = time.Now().Unix()
1918
session.UpdatedAt = time.Now().Unix()
2019
sessionCollection, _ := p.db.Collection(ctx, models.Collections.Session)
@@ -24,3 +23,8 @@ func (p *provider) AddSession(ctx context.Context, session *models.Session) erro
2423
}
2524
return nil
2625
}
26+
27+
// DeleteSession to delete session information from database
28+
func (p *provider) DeleteSession(ctx context.Context, userId string) error {
29+
return nil
30+
}

‎server/db/providers/arangodb/user.go‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
7373
if err != nil {
7474
return err
7575
}
76-
7776
query := fmt.Sprintf(`FOR d IN %s FILTER d.user_id == @user_id REMOVE { _key: d._key } IN %s`, models.Collections.Session, models.Collections.Session)
7877
bindVars := map[string]interface{}{
7978
"user_id": user.Key,
@@ -83,7 +82,6 @@ func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
8382
return err
8483
}
8584
defer cursor.Close()
86-
8785
return nil
8886
}
8987

@@ -93,16 +91,13 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
9391
sctx := arangoDriver.WithQueryFullCount(ctx)
9492

9593
query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.User, pagination.Offset, pagination.Limit)
96-
9794
cursor, err := p.db.Query(sctx, query, nil)
9895
if err != nil {
9996
return nil, err
10097
}
10198
defer cursor.Close()
102-
10399
paginationClone := pagination
104100
paginationClone.Total = cursor.Statistics().FullCount()
105-
106101
for {
107102
var user *models.User
108103
meta, err := cursor.ReadDocument(ctx, &user)
@@ -115,7 +110,6 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
115110
users = append(users, user.AsAPIUser())
116111
}
117112
}
118-
119113
return &model.Users{
120114
Pagination: paginationClone,
121115
Users: users,
@@ -136,7 +130,7 @@ func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.Us
136130
defer cursor.Close()
137131
for {
138132
if !cursor.HasMore() {
139-
if user.Key == "" {
133+
if user == nil {
140134
return user, fmt.Errorf("user not found")
141135
}
142136
break
@@ -163,7 +157,7 @@ func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, er
163157
defer cursor.Close()
164158
for {
165159
if !cursor.HasMore() {
166-
if user.Key == "" {
160+
if user == nil {
167161
return user, fmt.Errorf("user not found")
168162
}
169163
break
@@ -218,7 +212,7 @@ func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string)
218212
defer cursor.Close()
219213
for {
220214
if !cursor.HasMore() {
221-
if user.Key == "" {
215+
if user == nil {
222216
return nil, fmt.Errorf("user not found")
223217
}
224218
break

0 commit comments

Comments
 (0)