mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

- Add SetUpdateTime() to all Update statements (#20)

Browse source 
- Refactor Updates to use a shared method
- Remove private setXX() methods

Co-authored-by: alexf@example.com <alexf@example.com>
This commit is contained in:
alexfca 2021-09-24 10:56:06 +10:00 committed by GitHub
parent 3088238419
commit 1a5d7f2bb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 140 additions and 306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
appservice/storage/cosmosdb/appservice_events_table.go
View file

@ -144,18 +144,6 @@ func getEvent(s *eventsStatements, ctx context.Context, pk string, docId string)
return &response, err return &response, err
} }
func setEvent(s *eventsStatements, ctx context.Context, event eventCosmosData) (*eventCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(event.Pk, event.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
event.Id,
&event,
optionsReplace)
return &event, ex
}
func deleteEvent(s *eventsStatements, ctx context.Context, event eventCosmosData) error { func deleteEvent(s *eventsStatements, ctx context.Context, event eventCosmosData) error {
var options = cosmosdbapi.GetDeleteDocumentOptions(event.Pk) var options = cosmosdbapi.GetDeleteDocumentOptions(event.Pk)
var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument( var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument(
@ -392,7 +380,8 @@ func (s *eventsStatements) updateTxnIDForEvents(
for _, item := range rows { for _, item := range rows {
item.Event.TXNID = int64(txnID) item.Event.TXNID = int64(txnID)
// _, err := s.updateTxnIDForEventsStmt.ExecContext(ctx, txnID, appserviceID, maxID) // _, err := s.updateTxnIDForEventsStmt.ExecContext(ctx, txnID, appserviceID, maxID)
_, err = setEvent(s, ctx, item) item.SetUpdateTime()
_, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
} }
return err return err

23
federationsender/storage/cosmosdb/inbound_peeks_table.go
View file

@ -114,18 +114,6 @@ func getInboundPeek(s *inboundPeeksStatements, ctx context.Context, pk string, d
return &response, err return &response, err
} }
func setInboundPeek(s *inboundPeeksStatements, ctx context.Context, inboundPeek inboundPeekCosmosData) (*inboundPeekCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(inboundPeek.Pk, inboundPeek.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
inboundPeek.Id,
&inboundPeek,
optionsReplace)
return &inboundPeek, ex
}
func deleteInboundPeek(s *inboundPeeksStatements, ctx context.Context, dbData inboundPeekCosmosData) error { func deleteInboundPeek(s *inboundPeeksStatements, ctx context.Context, dbData inboundPeekCosmosData) error {
var options = cosmosdbapi.GetDeleteDocumentOptions(dbData.Pk) var options = cosmosdbapi.GetDeleteDocumentOptions(dbData.Pk)
var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument( var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument(
@ -209,20 +197,21 @@ func (s *inboundPeeksStatements) RenewInboundPeek(
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
// _, err = sqlutil.TxStmt(txn, s.renewInboundPeekStmt).ExecContext(ctx, nowMilli, renewalInterval, roomID, serverName, peekID) // _, err = sqlutil.TxStmt(txn, s.renewInboundPeekStmt).ExecContext(ctx, nowMilli, renewalInterval, roomID, serverName, peekID)
res, err := getInboundPeek(s, ctx, s.getPartitionKey(roomID), cosmosDocId) item, err := getInboundPeek(s, ctx, s.getPartitionKey(roomID), cosmosDocId)
if err != nil { if err != nil {
return return
} }
if res == nil { if item == nil {
return return
} }
res.InboundPeek.RenewedTimestamp = nowMilli item.SetUpdateTime()
res.InboundPeek.RenewalInterval = renewalInterval item.InboundPeek.RenewedTimestamp = nowMilli
item.InboundPeek.RenewalInterval = renewalInterval
_, err = setInboundPeek(s, ctx, *res) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
return return
} }

23
federationsender/storage/cosmosdb/outbound_peeks_table.go
View file

@ -111,18 +111,6 @@ func getOutboundPeek(s *outboundPeeksStatements, ctx context.Context, pk string,
return &response, err return &response, err
} }
func setOutboundPeek(s *outboundPeeksStatements, ctx context.Context, outboundPeek outboundPeekCosmosData) (*outboundPeekCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(outboundPeek.Pk, outboundPeek.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
outboundPeek.Id,
&outboundPeek,
optionsReplace)
return &outboundPeek, ex
}
func deleteOutboundPeek(s *outboundPeeksStatements, ctx context.Context, dbData outboundPeekCosmosData) error { func deleteOutboundPeek(s *outboundPeeksStatements, ctx context.Context, dbData outboundPeekCosmosData) error {
var options = cosmosdbapi.GetDeleteDocumentOptions(dbData.Pk) var options = cosmosdbapi.GetDeleteDocumentOptions(dbData.Pk)
var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument( var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument(
@ -206,20 +194,21 @@ func (s *outboundPeeksStatements) RenewOutboundPeek(
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
// _, err = sqlutil.TxStmt(txn, s.renewOutboundPeekStmt).ExecContext(ctx, nowMilli, renewalInterval, roomID, serverName, peekID) // _, err = sqlutil.TxStmt(txn, s.renewOutboundPeekStmt).ExecContext(ctx, nowMilli, renewalInterval, roomID, serverName, peekID)
res, err := getOutboundPeek(s, ctx, s.getPartitionKey(roomID), cosmosDocId) item, err := getOutboundPeek(s, ctx, s.getPartitionKey(roomID), cosmosDocId)
if err != nil { if err != nil {
return return
} }
if res == nil { if item == nil {
return return
} }
res.OutboundPeek.RenewedTimestamp = nowMilli item.SetUpdateTime()
res.OutboundPeek.RenewalInterval = renewalInterval item.OutboundPeek.RenewedTimestamp = nowMilli
item.OutboundPeek.RenewalInterval = renewalInterval
_, err = setOutboundPeek(s, ctx, *res) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
return return
} }

28
internal/cosmosdbapi/client.go
View file

@ -61,8 +61,8 @@ func PerformQuery(ctx context.Context,
if err != nil { if err != nil {
return err return err
} }
optionsQry := GetQueryDocumentsOptions(partitonKey) optionsQry := getQueryDocumentsOptions(partitonKey)
var query = GetQuery(qryString, params) var query = getQuery(qryString, params)
_, err = GetClient(conn).QueryDocuments( _, err = GetClient(conn).QueryDocuments(
ctx, ctx,
databaseName, databaseName,
@ -84,8 +84,8 @@ func PerformQueryAllPartitions(ctx context.Context,
if err != nil { if err != nil {
return err return err
} }
var optionsQry = GetQueryAllPartitionsDocumentsOptions() var optionsQry = getQueryAllPartitionsDocumentsOptions()
var query = GetQuery(qryString, params) var query = getQuery(qryString, params)
_, err = GetClient(conn).QueryDocuments( _, err = GetClient(conn).QueryDocuments(
ctx, ctx,
databaseName, databaseName,
@ -141,6 +141,26 @@ func GetDocumentOrNil(connection CosmosConnection, config CosmosConfig, ctx cont
return nil return nil
} }
func UpdateDocument(ctx context.Context,
conn CosmosConnection,
databaseName string,
containerName string,
partitionKey string,
eTag string,
docId string,
document interface{},
) (*interface{}, error) {
optionsReplace := getReplaceDocumentOptions(partitionKey, eTag)
_, _, err := GetClient(conn).ReplaceDocument(
ctx,
databaseName,
containerName,
docId,
&document,
optionsReplace)
return &document, err
}
func validateQuery(qryString string) error { func validateQuery(qryString string) error {
if len(qryString) == 0 { if len(qryString) == 0 {
return errors.New("qryString was nil") return errors.New("qryString was nil")

6
internal/cosmosdbapi/documentoperations.go
View file

@ -18,7 +18,7 @@ func getUpsertDocumentOptions(pk string) cosmosapi.CreateDocumentOptions {
} }
} }
func GetQueryDocumentsOptions(pk string) cosmosapi.QueryDocumentsOptions { func getQueryDocumentsOptions(pk string) cosmosapi.QueryDocumentsOptions {
return cosmosapi.QueryDocumentsOptions{ return cosmosapi.QueryDocumentsOptions{
PartitionKeyValue: pk, PartitionKeyValue: pk,
IsQuery: true, IsQuery: true,
@ -26,7 +26,7 @@ func GetQueryDocumentsOptions(pk string) cosmosapi.QueryDocumentsOptions {
} }
} }
func GetQueryAllPartitionsDocumentsOptions() cosmosapi.QueryDocumentsOptions { func getQueryAllPartitionsDocumentsOptions() cosmosapi.QueryDocumentsOptions {
return cosmosapi.QueryDocumentsOptions{ return cosmosapi.QueryDocumentsOptions{
IsQuery: true, IsQuery: true,
EnableCrossPartition: true, EnableCrossPartition: true,
@ -40,7 +40,7 @@ func GetGetDocumentOptions(pk string) cosmosapi.GetDocumentOptions {
} }
} }
func GetReplaceDocumentOptions(pk string, etag string) cosmosapi.ReplaceDocumentOptions { func getReplaceDocumentOptions(pk string, etag string) cosmosapi.ReplaceDocumentOptions {
return cosmosapi.ReplaceDocumentOptions{ return cosmosapi.ReplaceDocumentOptions{
PartitionKeyValue: pk, PartitionKeyValue: pk,
IfMatch: etag, IfMatch: etag,

12
internal/cosmosdbapi/query.go
View file

@ -4,17 +4,17 @@ import (
cosmosapi "github.com/vippsas/go-cosmosdb/cosmosapi" cosmosapi "github.com/vippsas/go-cosmosdb/cosmosapi"
) )
func GetQuery(qry string, params map[string]interface{}) cosmosapi.Query { func getQuery(qry string, params map[string]interface{}) cosmosapi.Query {
qryParams := []cosmosapi.QueryParam{} qryParams := []cosmosapi.QueryParam{}
for key, value := range params { for key, value := range params {
qryParam := cosmosapi.QueryParam { qryParam := cosmosapi.QueryParam{
Name: key, Name: key,
Value: value, Value: value,
} }
qryParams = append(qryParams, qryParam) qryParams = append(qryParams, qryParam)
} }
return cosmosapi.Query { return cosmosapi.Query{
Query: qry, Query: qry,
Params: qryParams, Params: qryParams,
} }
} }

11
internal/cosmosdbutil/document_seq.go
View file

@ -53,15 +53,8 @@ func GetNextSequence(
} }
} else { } else {
dbData.Value++ dbData.Value++
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(dbData.Pk, dbData.ETag) dbData.SetUpdateTime()
var _, _, err = cosmosdbapi.GetClient(connection).ReplaceDocument( _, err := cosmosdbapi.UpdateDocument(ctx, connection, config.DatabaseName, config.ContainerName, dbData.Pk, dbData.ETag, dbData.Id, dbData)
ctx,
config.DatabaseName,
config.ContainerName,
cosmosDocId,
dbData,
optionsReplace,
)
if err != nil { if err != nil {
return -1, err return -1, err
} }

18
roomserver/storage/cosmosdb/events_table.go
View file

@ -233,18 +233,6 @@ func getEvent(s *eventStatements, ctx context.Context, pk string, docId string)
return &response, err return &response, err
} }
func setEvent(s *eventStatements, ctx context.Context, event eventCosmosData) (*eventCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(event.Pk, event.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
event.Id,
&event,
optionsReplace)
return &event, ex
}
func isEventAuthEventNIDsSame( func isEventAuthEventNIDsSame(
ids []int64, ids []int64,
authEventNIDs []types.EventNID, authEventNIDs []types.EventNID,
@ -634,9 +622,10 @@ func (s *eventStatements) UpdateEventState(
} }
item := rows[0] item := rows[0]
item.SetUpdateTime()
item.Event.StateSnapshotNID = int64(stateNID) item.Event.StateSnapshotNID = int64(stateNID)
var _, exReplace = setEvent(s, ctx, item) _, exReplace := cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if exReplace != nil {
return exReplace return exReplace
} }
@ -691,9 +680,10 @@ func (s *eventStatements) UpdateEventSentToOutput(ctx context.Context, txn *sql.
} }
item := rows[0] item := rows[0]
item.SetUpdateTime()
item.Event.SentToOutput = true item.Event.SentToOutput = true
var _, exReplace = setEvent(s, ctx, item) _, exReplace := cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if exReplace != nil {
return exReplace return exReplace
} }

15
roomserver/storage/cosmosdb/invite_table.go
View file

@ -120,18 +120,6 @@ func getInvite(s *inviteStatements, ctx context.Context, pk string, docId string
return &response, err return &response, err
} }
func setInvite(s *inviteStatements, ctx context.Context, invite inviteCosmosData) (*inviteCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(invite.Pk, invite.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
invite.Id,
&invite,
optionsReplace)
return &invite, ex
}
func NewCosmosDBInvitesTable(db *Database) (tables.Invites, error) { func NewCosmosDBInvitesTable(db *Database) (tables.Invites, error) {
s := &inviteStatements{ s := &inviteStatements{
db: db, db: db,
@ -224,8 +212,9 @@ func (s *inviteStatements) UpdateInviteRetired(
// UPDATE roomserver_invites SET retired = TRUE WHERE room_nid = $1 AND target_nid = $2 AND NOT retired // UPDATE roomserver_invites SET retired = TRUE WHERE room_nid = $1 AND target_nid = $2 AND NOT retired
// now retire the invites // now retire the invites
item.SetUpdateTime()
item.Invite.Retired = true item.Invite.Retired = true
_, err = setInvite(s, ctx, item) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
} }
return return

21
roomserver/storage/cosmosdb/membership_table.go
View file

@ -232,18 +232,6 @@ func getMembership(s *membershipStatements, ctx context.Context, pk string, docI
return &response, err return &response, err
} }
func setMembership(s *membershipStatements, ctx context.Context, membership membershipCosmosData) (*membershipCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(membership.Pk, membership.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
membership.Id,
&membership,
optionsReplace)
return &membership, ex
}
func NewCosmosDBMembershipTable(db *Database) (tables.Membership, error) { func NewCosmosDBMembershipTable(db *Database) (tables.Membership, error) {
s := &membershipStatements{ s := &membershipStatements{
db: db, db: db,
@ -290,7 +278,8 @@ func (s *membershipStatements) InsertMembership(
exists.Membership.TargetNID = int64(targetUserNID) exists.Membership.TargetNID = int64(targetUserNID)
exists.Membership.TargetLocal = localTarget exists.Membership.TargetLocal = localTarget
exists.SetUpdateTime() exists.SetUpdateTime()
_, errSet := setMembership(s, ctx, *exists) exists.SetUpdateTime()
_, errSet := cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, exists.Pk, exists.ETag, exists.Id, exists)
return errSet return errSet
} }
@ -455,8 +444,9 @@ func (s *membershipStatements) UpdateMembership(
dbData.Membership.MembershipNID = int64(membership) dbData.Membership.MembershipNID = int64(membership)
dbData.Membership.EventNID = int64(eventNID) dbData.Membership.EventNID = int64(eventNID)
dbData.Membership.Forgotten = forgotten dbData.Membership.Forgotten = forgotten
dbData.SetUpdateTime()
_, err = setMembership(s, ctx, *dbData) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, dbData.Pk, dbData.ETag, dbData.Id, dbData)
return err return err
} }
@ -711,8 +701,9 @@ func (s *membershipStatements) UpdateForgetMembership(
return err return err
} }
dbData.SetUpdateTime()
dbData.Membership.Forgotten = forget dbData.Membership.Forgotten = forget
_, err = setMembership(s, ctx, *dbData) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, dbData.Pk, dbData.ETag, dbData.Id, dbData)
return err return err
} }

19
roomserver/storage/cosmosdb/redactions_table.go
View file

@ -99,18 +99,6 @@ func getRedaction(s *redactionStatements, ctx context.Context, pk string, docId
return &response, err return &response, err
} }
func setRedaction(s *redactionStatements, ctx context.Context, redaction redactionCosmosData) (*redactionCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(redaction.Pk, redaction.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
redaction.Id,
&redaction,
optionsReplace)
return &redaction, ex
}
func NewCosmosDBRedactionsTable(db *Database) (tables.Redactions, error) { func NewCosmosDBRedactionsTable(db *Database) (tables.Redactions, error) {
s := &redactionStatements{ s := &redactionStatements{
db: db, db: db,
@ -242,13 +230,14 @@ func (s *redactionStatements) MarkRedactionValidated(
docId := redactionEventID docId := redactionEventID
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
response, err := getRedaction(s, ctx, s.getPartitionKey(), cosmosDocId) item, err := getRedaction(s, ctx, s.getPartitionKey(), cosmosDocId)
if err != nil { if err != nil {
return err return err
} }
response.Redaction.Validated = validated item.SetUpdateTime()
item.Redaction.Validated = validated
_, err = setRedaction(s, ctx, *response) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
return err return err
} }

15
roomserver/storage/cosmosdb/rooms_table.go
View file

@ -164,18 +164,6 @@ func getRoom(s *roomStatements, ctx context.Context, pk string, docId string) (*
return &response, err return &response, err
} }
func setRoom(s *roomStatements, ctx context.Context, room roomCosmosData) (*roomCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(room.Pk, room.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
room.Id,
&room,
optionsReplace)
return &room, ex
}
func (s *roomStatements) SelectRoomIDs(ctx context.Context) ([]string, error) { func (s *roomStatements) SelectRoomIDs(ctx context.Context) ([]string, error) {
// "SELECT room_id FROM roomserver_rooms" // "SELECT room_id FROM roomserver_rooms"
@ -398,11 +386,12 @@ func (s *roomStatements) UpdateLatestEventNIDs(
//Assume 1 per RoomNID //Assume 1 per RoomNID
room := rows[0] room := rows[0]
room.SetUpdateTime()
room.Room.LatestEventNIDs = mapFromEventNIDArray(eventNIDs) room.Room.LatestEventNIDs = mapFromEventNIDArray(eventNIDs)
room.Room.LastEventSentNID = int64(lastEventSentNID) room.Room.LastEventSentNID = int64(lastEventSentNID)
room.Room.StateSnapshotNID = int64(stateSnapshotNID) room.Room.StateSnapshotNID = int64(stateSnapshotNID)
_, err = setRoom(s, ctx, room) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, room.Pk, room.ETag, room.Id, room)
return err return err
} }

15
roomserver/storage/cosmosdb/state_block_table.go
View file

@ -107,18 +107,6 @@ func getStateBlock(s *stateBlockStatements, ctx context.Context, pk string, docI
return &response, err return &response, err
} }
func setStateBlock(s *stateBlockStatements, ctx context.Context, item stateBlockCosmosData) (*stateBlockCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(item.Pk, item.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
item.Id,
&item,
optionsReplace)
return &item, ex
}
func NewCosmosDBStateBlockTable(db *Database) (tables.StateBlock, error) { func NewCosmosDBStateBlockTable(db *Database) (tables.StateBlock, error) {
s := &stateBlockStatements{ s := &stateBlockStatements{
db: db, db: db,
@ -168,9 +156,10 @@ func (s *stateBlockStatements) BulkInsertStateData(
} }
if existing != nil { if existing != nil {
//if exists, just update and dont create a new seq //if exists, just update and dont create a new seq
existing.SetUpdateTime()
existing.StateBlock.EventNIDs = ids existing.StateBlock.EventNIDs = ids
existing.SetUpdateTime() existing.SetUpdateTime()
_, err = setStateBlock(s, ctx, *existing) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, existing.Pk, existing.ETag, existing.Id, existing)
if err != nil { if err != nil {
return 0, err return 0, err
} }

15
syncapi/storage/cosmosdb/invites_table.go
View file

@ -121,18 +121,6 @@ func getInviteEvent(s *inviteEventsStatements, ctx context.Context, pk string, d
return &response, err return &response, err
} }
func setInviteEvent(s *inviteEventsStatements, ctx context.Context, invite inviteEventCosmosData) (*inviteEventCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(invite.Pk, invite.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
invite.Id,
&invite,
optionsReplace)
return &invite, ex
}
func NewCosmosDBInvitesTable(db *SyncServerDatasource, streamID *streamIDStatements) (tables.Invites, error) { func NewCosmosDBInvitesTable(db *SyncServerDatasource, streamID *streamIDStatements) (tables.Invites, error) {
s := &inviteEventsStatements{ s := &inviteEventsStatements{
db: db, db: db,
@ -225,9 +213,10 @@ func (s *inviteEventsStatements) DeleteInviteEvent(
s.getPartitionKey(), s.deleteInviteEventStmt, params, &rows) s.getPartitionKey(), s.deleteInviteEventStmt, params, &rows)
for _, item := range rows { for _, item := range rows {
item.SetUpdateTime()
item.InviteEvent.Deleted = true item.InviteEvent.Deleted = true
item.InviteEvent.ID = int64(streamPos) item.InviteEvent.ID = int64(streamPos)
setInviteEvent(s, ctx, item) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
} }
return streamPos, err return streamPos, err
} }

15
syncapi/storage/cosmosdb/output_room_events_table.go
View file

@ -160,18 +160,6 @@ func (s *outputRoomEventsStatements) getPartitionKey() string {
return cosmosdbapi.GetPartitionKeyByCollection(s.db.cosmosConfig.TenantName, s.getCollectionName()) return cosmosdbapi.GetPartitionKeyByCollection(s.db.cosmosConfig.TenantName, s.getCollectionName())
} }
func setOutputRoomEvent(s *outputRoomEventsStatements, ctx context.Context, outputRoomEvent outputRoomEventCosmosData) (*outputRoomEventCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(outputRoomEvent.Pk, outputRoomEvent.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
outputRoomEvent.Id,
&outputRoomEvent,
optionsReplace)
return &outputRoomEvent, ex
}
func deleteOutputRoomEvent(s *outputRoomEventsStatements, ctx context.Context, dbData outputRoomEventCosmosData) error { func deleteOutputRoomEvent(s *outputRoomEventsStatements, ctx context.Context, dbData outputRoomEventCosmosData) error {
var options = cosmosdbapi.GetDeleteDocumentOptions(dbData.Pk) var options = cosmosdbapi.GetDeleteDocumentOptions(dbData.Pk)
var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument( var _, err = cosmosdbapi.GetClient(s.db.connection).DeleteDocument(
@ -227,8 +215,9 @@ func (s *outputRoomEventsStatements) UpdateEventJSON(ctx context.Context, event
} }
for _, item := range rows { for _, item := range rows {
item.SetUpdateTime()
item.OutputRoomEvent.HeaderedEventJSON = headeredJSON item.OutputRoomEvent.HeaderedEventJSON = headeredJSON
_, err = setOutputRoomEvent(s, ctx, item) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
} }
return err return err

18
syncapi/storage/cosmosdb/peeks_table.go
View file

@ -140,18 +140,6 @@ func getPeek(s *peekStatements, ctx context.Context, pk string, docId string) (*
return &response, err return &response, err
} }
func setPeek(s *peekStatements, ctx context.Context, peek peekCosmosData) (*peekCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(peek.Pk, peek.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
peek.Id,
&peek,
optionsReplace)
return &peek, ex
}
func NewCosmosDBPeeksTable(db *SyncServerDatasource, streamID *streamIDStatements) (tables.Peeks, error) { func NewCosmosDBPeeksTable(db *SyncServerDatasource, streamID *streamIDStatements) (tables.Peeks, error) {
s := &peekStatements{ s := &peekStatements{
db: db, db: db,
@ -249,9 +237,10 @@ func (s *peekStatements) DeletePeek(
} }
for _, item := range rows { for _, item := range rows {
item.SetUpdateTime()
item.Peek.Deleted = true item.Peek.Deleted = true
item.Peek.ID = int64(streamPos) item.Peek.ID = int64(streamPos)
_, err = setPeek(s, ctx, item) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if err != nil { if err != nil {
return return
} }
@ -293,9 +282,10 @@ func (s *peekStatements) DeletePeeks(
} }
for _, item := range rows { for _, item := range rows {
item.SetUpdateTime()
item.Peek.Deleted = true item.Peek.Deleted = true
item.Peek.ID = int64(streamPos) item.Peek.ID = int64(streamPos)
_, err = setPeek(s, ctx, item) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if err != nil { if err != nil {
return 0, err return 0, err
} }

35
userapi/storage/accounts/cosmosdb/accounts_table.go
View file

@ -109,19 +109,6 @@ func getAccount(s *accountsStatements, ctx context.Context, pk string, docId str
return &response, err return &response, err
} }
func setAccount(s *accountsStatements, ctx context.Context, account accountCosmosData) (*accountCosmosData, error) {
response := accountCosmosData{}
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(account.Pk, account.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
account.Id,
&account,
optionsReplace)
return &response, ex
}
func mapFromAccount(db accountCosmos) api.Account { func mapFromAccount(db accountCosmos) api.Account {
return api.Account{ return api.Account{
AppServiceID: db.AppServiceID, AppServiceID: db.AppServiceID,
@ -193,16 +180,17 @@ func (s *accountsStatements) updatePassword(
docId := localpart docId := localpart
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
var response, exGet = getAccount(s, ctx, s.getPartitionKey(), cosmosDocId) var item, exGet = getAccount(s, ctx, s.getPartitionKey(), cosmosDocId)
if exGet != nil { if exGet != nil {
return exGet return exGet
} }
response.Account.PasswordHash = passwordHash item.SetUpdateTime()
item.Account.PasswordHash = passwordHash
var _, exReplace = setAccount(s, ctx, *response) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if err != nil {
return exReplace return err
} }
return return
} }
@ -215,16 +203,17 @@ func (s *accountsStatements) deactivateAccount(
docId := localpart docId := localpart
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
var response, exGet = getAccount(s, ctx, s.getPartitionKey(), cosmosDocId) var item, exGet = getAccount(s, ctx, s.getPartitionKey(), cosmosDocId)
if exGet != nil { if exGet != nil {
return exGet return exGet
} }
response.Account.IsDeactivated = true item.SetUpdateTime()
item.Account.IsDeactivated = true
var _, exReplace = setAccount(s, ctx, *response) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if err != nil {
return exReplace return err
} }
return return
} }

27
userapi/storage/accounts/cosmosdb/key_backup_table.go
View file

@ -136,18 +136,6 @@ func getKeyBackup(s *keyBackupStatements, ctx context.Context, pk string, docId
return &response, err return &response, err
} }
func setKeyBackup(s *keyBackupStatements, ctx context.Context, keyBackup keyBackupCosmosData) (*keyBackupCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(keyBackup.Pk, keyBackup.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
keyBackup.Id,
&keyBackup,
optionsReplace)
return &keyBackup, ex
}
func (s *keyBackupStatements) prepare(db *Database, server gomatrixserverlib.ServerName) (err error) { func (s *keyBackupStatements) prepare(db *Database, server gomatrixserverlib.ServerName) (err error) {
s.db = db s.db = db
// s.insertBackupKeyStmt = insertBackupKeySQL // s.insertBackupKeyStmt = insertBackupKeySQL
@ -243,23 +231,24 @@ func (s *keyBackupStatements) updateBackupKey(
docId := fmt.Sprintf("%s_%s_%s_%s", userID, key.RoomID, key.SessionID, version) docId := fmt.Sprintf("%s_%s_%s_%s", userID, key.RoomID, key.SessionID, version)
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
res, err := getKeyBackup(s, ctx, s.getPartitionKey(userID), cosmosDocId) item, err := getKeyBackup(s, ctx, s.getPartitionKey(userID), cosmosDocId)
if err != nil { if err != nil {
return return
} }
if res == nil { if item == nil {
return return
} }
// ctx, key.FirstMessageIndex, key.ForwardedCount, key.IsVerified, string(key.SessionData), userID, key.RoomID, key.SessionID, version, // ctx, key.FirstMessageIndex, key.ForwardedCount, key.IsVerified, string(key.SessionData), userID, key.RoomID, key.SessionID, version,
res.KeyBackup.FirstMessageIndex = key.FirstMessageIndex item.SetUpdateTime()
res.KeyBackup.ForwardedCount = key.ForwardedCount item.KeyBackup.FirstMessageIndex = key.FirstMessageIndex
res.KeyBackup.IsVerified = key.IsVerified item.KeyBackup.ForwardedCount = key.ForwardedCount
res.KeyBackup.SessionData = key.SessionData item.KeyBackup.IsVerified = key.IsVerified
item.KeyBackup.SessionData = key.SessionData
_, err = setKeyBackup(s, ctx, *res) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
return return
} }

39
userapi/storage/accounts/cosmosdb/key_backup_version_table.go
View file

@ -117,18 +117,6 @@ func getKeyBackupVersion(s *keyBackupVersionStatements, ctx context.Context, pk
return &response, err return &response, err
} }
func setKeyBackupVersion(s *keyBackupVersionStatements, ctx context.Context, keyBackup keyBackupVersionCosmosData) (*keyBackupVersionCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(keyBackup.Pk, keyBackup.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
keyBackup.Id,
&keyBackup,
optionsReplace)
return &keyBackup, ex
}
func (s *keyBackupVersionStatements) prepare(db *Database, server gomatrixserverlib.ServerName) (err error) { func (s *keyBackupVersionStatements) prepare(db *Database, server gomatrixserverlib.ServerName) (err error) {
s.db = db s.db = db
// s.insertKeyBackupStmt = insertKeyBackupSQL // s.insertKeyBackupStmt = insertKeyBackupSQL
@ -196,20 +184,21 @@ func (s *keyBackupVersionStatements) updateKeyBackupAuthData(
docId := fmt.Sprintf("%s_%d", userID, versionInt) docId := fmt.Sprintf("%s_%d", userID, versionInt)
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
res, err := getKeyBackupVersion(s, ctx, s.getPartitionKey(userID), cosmosDocId) item, err := getKeyBackupVersion(s, ctx, s.getPartitionKey(userID), cosmosDocId)
if err != nil { if err != nil {
return err return err
} }
if res == nil { if item == nil {
return err return err
} }
// _, err = txn.Stmt(s.updateKeyBackupAuthDataStmt).ExecContext(ctx, string(authData), userID, versionInt) // _, err = txn.Stmt(s.updateKeyBackupAuthDataStmt).ExecContext(ctx, string(authData), userID, versionInt)
res.KeyBackupVersion.AuthData = authData item.SetUpdateTime()
item.KeyBackupVersion.AuthData = authData
_, err = setKeyBackupVersion(s, ctx, *res) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
return err return err
} }
@ -226,20 +215,21 @@ func (s *keyBackupVersionStatements) updateKeyBackupETag(
docId := fmt.Sprintf("%s_%d", userID, versionInt) docId := fmt.Sprintf("%s_%d", userID, versionInt)
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
res, err := getKeyBackupVersion(s, ctx, s.getPartitionKey(userID), cosmosDocId) item, err := getKeyBackupVersion(s, ctx, s.getPartitionKey(userID), cosmosDocId)
if err != nil { if err != nil {
return err return err
} }
if res == nil { if item == nil {
return err return err
} }
// _, err = txn.Stmt(s.updateKeyBackupETagStmt).ExecContext(ctx, etag, userID, versionInt) // _, err = txn.Stmt(s.updateKeyBackupETagStmt).ExecContext(ctx, etag, userID, versionInt)
res.KeyBackupVersion.Etag = etag item.SetUpdateTime()
item.KeyBackupVersion.Etag = etag
_, err = setKeyBackupVersion(s, ctx, *res) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
return err return err
} }
@ -256,20 +246,21 @@ func (s *keyBackupVersionStatements) deleteKeyBackup(
docId := fmt.Sprintf("%s_%d", userID, versionInt) docId := fmt.Sprintf("%s_%d", userID, versionInt)
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
res, err := getKeyBackupVersion(s, ctx, s.getPartitionKey(userID), cosmosDocId) item, err := getKeyBackupVersion(s, ctx, s.getPartitionKey(userID), cosmosDocId)
if err != nil { if err != nil {
return false, err return false, err
} }
if res == nil { if item == nil {
return false, err return false, err
} }
// result, err := txn.Stmt(s.deleteKeyBackupStmt).ExecContext(ctx, userID, versionInt) // result, err := txn.Stmt(s.deleteKeyBackupStmt).ExecContext(ctx, userID, versionInt)
res.KeyBackupVersion.Deleted = 1 item.SetUpdateTime()
item.KeyBackupVersion.Deleted = 1
_, err = setKeyBackupVersion(s, ctx, *res) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if err != nil { if err != nil {
return false, err return false, err

34
userapi/storage/accounts/cosmosdb/profile_table.go
View file

@ -108,18 +108,6 @@ func getProfile(s *profilesStatements, ctx context.Context, pk string, docId str
return &response, err return &response, err
} }
func setProfile(s *profilesStatements, ctx context.Context, profile profileCosmosData) (*profileCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(profile.Pk, profile.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
profile.Id,
&profile,
optionsReplace)
return &profile, ex
}
func (s *profilesStatements) insertProfile( func (s *profilesStatements) insertProfile(
ctx context.Context, localpart string, ctx context.Context, localpart string,
) error { ) error {
@ -188,16 +176,17 @@ func (s *profilesStatements) setAvatarURL(
docId := localpart docId := localpart
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
var response, exGet = getProfile(s, ctx, s.getPartitionKey(), cosmosDocId) var item, exGet = getProfile(s, ctx, s.getPartitionKey(), cosmosDocId)
if exGet != nil { if exGet != nil {
return exGet return exGet
} }
response.Profile.AvatarURL = avatarURL item.SetUpdateTime()
item.Profile.AvatarURL = avatarURL
var _, exReplace = setProfile(s, ctx, *response) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if err != nil {
return exReplace return err
} }
return return
} }
@ -209,16 +198,17 @@ func (s *profilesStatements) setDisplayName(
// "UPDATE account_profiles SET display_name = $1 WHERE localpart = $2" // "UPDATE account_profiles SET display_name = $1 WHERE localpart = $2"
docId := localpart docId := localpart
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
var response, exGet = getProfile(s, ctx, s.getPartitionKey(), cosmosDocId) var item, exGet = getProfile(s, ctx, s.getPartitionKey(), cosmosDocId)
if exGet != nil { if exGet != nil {
return exGet return exGet
} }
response.Profile.DisplayName = displayName item.SetUpdateTime()
item.Profile.DisplayName = displayName
var _, exReplace = setProfile(s, ctx, *response) _, err = cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if err != nil {
return exReplace return err
} }
return return
} }

40
userapi/storage/devices/cosmosdb/devices_table.go
View file

@ -144,18 +144,6 @@ func getDevice(s *devicesStatements, ctx context.Context, pk string, docId strin
return &response, err return &response, err
} }
func setDevice(s *devicesStatements, ctx context.Context, device deviceCosmosData) (*deviceCosmosData, error) {
var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(device.Pk, device.ETag)
var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument(
ctx,
s.db.cosmosConfig.DatabaseName,
s.db.cosmosConfig.ContainerName,
device.Id,
&device,
optionsReplace)
return &device, ex
}
func (s *devicesStatements) prepare(db *Database, server gomatrixserverlib.ServerName) (err error) { func (s *devicesStatements) prepare(db *Database, server gomatrixserverlib.ServerName) (err error) {
s.db = db s.db = db
s.selectDevicesCountStmt = "select count(c._ts) as sessioncount from c where c._cn = @x1" s.selectDevicesCountStmt = "select count(c._ts) as sessioncount from c where c._cn = @x1"
@ -315,18 +303,19 @@ func (s *devicesStatements) updateDeviceName(
// "UPDATE device_devices SET display_name = $1 WHERE localpart = $2 AND device_id = $3" // "UPDATE device_devices SET display_name = $1 WHERE localpart = $2 AND device_id = $3"
docId := fmt.Sprintf("%s_%s", localpart, deviceID) docId := fmt.Sprintf("%s_%s", localpart, deviceID)
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
var response, exGet = getDevice(s, ctx, s.getPartitionKey(), cosmosDocId) var item, exGet = getDevice(s, ctx, s.getPartitionKey(), cosmosDocId)
if exGet != nil { if exGet != nil {
return exGet return exGet
} }
response.Device.DisplayName = *displayName item.SetUpdateTime()
item.Device.DisplayName = *displayName
var _, exReplace = setDevice(s, ctx, *response) _, err := cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if err != nil {
return exReplace return err
} }
return exReplace return err
} }
func (s *devicesStatements) selectDeviceByToken( func (s *devicesStatements) selectDeviceByToken(
@ -435,17 +424,18 @@ func (s *devicesStatements) updateDeviceLastSeen(ctx context.Context, localpart,
// "UPDATE device_devices SET last_seen_ts = $1, ip = $2 WHERE localpart = $3 AND device_id = $4" // "UPDATE device_devices SET last_seen_ts = $1, ip = $2 WHERE localpart = $3 AND device_id = $4"
docId := fmt.Sprintf("%s_%s", localpart, deviceID) docId := fmt.Sprintf("%s_%s", localpart, deviceID)
cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId) cosmosDocId := cosmosdbapi.GetDocumentId(s.db.cosmosConfig.TenantName, s.getCollectionName(), docId)
var response, exGet = getDevice(s, ctx, s.getPartitionKey(), cosmosDocId) var item, exGet = getDevice(s, ctx, s.getPartitionKey(), cosmosDocId)
if exGet != nil { if exGet != nil {
return exGet return exGet
} }
response.Device.LastSeenTS = lastSeenTs item.SetUpdateTime()
response.Device.LastSeenIP = ipAddr item.Device.LastSeenTS = lastSeenTs
item.Device.LastSeenIP = ipAddr
var _, exReplace = setDevice(s, ctx, *response) _, err := cosmosdbapi.UpdateDocument(ctx, s.db.connection, s.db.cosmosConfig.DatabaseName, s.db.cosmosConfig.ContainerName, item.Pk, item.ETag, item.Id, item)
if exReplace != nil { if err != nil {
return exReplace return err
} }
return exReplace return err
} }