diff --git a/keyserver/storage/cosmosdb/device_keys_table.go b/keyserver/storage/cosmosdb/device_keys_table.go index 330642c62..ae653d2f7 100644 --- a/keyserver/storage/cosmosdb/device_keys_table.go +++ b/keyserver/storage/cosmosdb/device_keys_table.go @@ -158,18 +158,6 @@ func getDeviceKey(s *deviceKeysStatements, ctx context.Context, pk string, docId return &response, err } -func setDeviceKey(s *deviceKeysStatements, ctx context.Context, pk string, event DeviceKeyCosmosData) (*DeviceKeyCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(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 insertDeviceKeyCore(s *deviceKeysStatements, ctx context.Context, dbData DeviceKeyCosmosData) error { var options = cosmosdbapi.GetUpsertDocumentOptions(dbData.Pk) var _, _, err = cosmosdbapi.GetClient(s.db.connection).CreateDocument( diff --git a/roomserver/storage/cosmosdb/events_table.go b/roomserver/storage/cosmosdb/events_table.go index c05539b5e..22ae446aa 100644 --- a/roomserver/storage/cosmosdb/events_table.go +++ b/roomserver/storage/cosmosdb/events_table.go @@ -241,8 +241,8 @@ func getEvent(s *eventStatements, ctx context.Context, pk string, docId string) return &response, err } -func setEvent(s *eventStatements, ctx context.Context, pk string, event EventCosmosData) (*EventCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, event.ETag) +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, @@ -558,7 +558,7 @@ func (s *eventStatements) UpdateEventState( item := response[0] item.Event.StateSnapshotNID = int64(stateNID) - var _, exReplace = setEvent(s, ctx, item.Pk, item) + var _, exReplace = setEvent(s, ctx, item) if exReplace != nil { return exReplace } @@ -607,7 +607,7 @@ func (s *eventStatements) UpdateEventSentToOutput(ctx context.Context, txn *sql. item := response[0] item.Event.SentToOutput = true - var _, exReplace = setEvent(s, ctx, item.Pk, item) + var _, exReplace = setEvent(s, ctx, item) if exReplace != nil { return exReplace } diff --git a/roomserver/storage/cosmosdb/membership_table.go b/roomserver/storage/cosmosdb/membership_table.go index 308870427..d922f02a5 100644 --- a/roomserver/storage/cosmosdb/membership_table.go +++ b/roomserver/storage/cosmosdb/membership_table.go @@ -213,8 +213,8 @@ func getMembership(s *membershipStatements, ctx context.Context, pk string, docI return &response, err } -func setMembership(s *membershipStatements, ctx context.Context, pk string, membership MembershipCosmosData) (*MembershipCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, membership.ETag) +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, @@ -425,7 +425,7 @@ func (s *membershipStatements) UpdateMembership( dbData.Membership.EventNID = int64(eventNID) dbData.Membership.Forgotten = forgotten - _, err = setMembership(s, ctx, pk, *dbData) + _, err = setMembership(s, ctx, *dbData) return err } @@ -610,6 +610,6 @@ func (s *membershipStatements) UpdateForgetMembership( dbData.Membership.Forgotten = forget - _, err = setMembership(s, ctx, pk, *dbData) + _, err = setMembership(s, ctx, *dbData) return err } diff --git a/roomserver/storage/cosmosdb/published_table.go b/roomserver/storage/cosmosdb/published_table.go index 0d26faeeb..731044d2e 100644 --- a/roomserver/storage/cosmosdb/published_table.go +++ b/roomserver/storage/cosmosdb/published_table.go @@ -107,18 +107,6 @@ func getPublish(s *publishedStatements, ctx context.Context, pk string, docId st return &response, err } -func setPublish(s *publishedStatements, ctx context.Context, pk string, publish PublishCosmosData) (*PublishCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, publish.ETag) - var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument( - ctx, - s.db.cosmosConfig.DatabaseName, - s.db.cosmosConfig.ContainerName, - publish.Id, - &publish, - optionsReplace) - return &publish, ex -} - func NewCosmosDBPublishedTable(db *Database) (tables.Published, error) { s := &publishedStatements{ db: db, diff --git a/roomserver/storage/cosmosdb/redactions_table.go b/roomserver/storage/cosmosdb/redactions_table.go index 91ed95d2d..1037ad1a1 100644 --- a/roomserver/storage/cosmosdb/redactions_table.go +++ b/roomserver/storage/cosmosdb/redactions_table.go @@ -117,8 +117,8 @@ func getRedaction(s *redactionStatements, ctx context.Context, pk string, docId return &response, err } -func setRedaction(s *redactionStatements, ctx context.Context, pk string, redaction RedactionCosmosData) (*RedactionCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, redaction.ETag) +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, @@ -273,6 +273,6 @@ func (s *redactionStatements) MarkRedactionValidated( response.Redaction.Validated = validated - _, err = setRedaction(s, ctx, pk, *response) + _, err = setRedaction(s, ctx, *response) return err } diff --git a/roomserver/storage/cosmosdb/rooms_table.go b/roomserver/storage/cosmosdb/rooms_table.go index 3348618ef..a9f50e7dc 100644 --- a/roomserver/storage/cosmosdb/rooms_table.go +++ b/roomserver/storage/cosmosdb/rooms_table.go @@ -182,8 +182,8 @@ func getRoom(s *roomStatements, ctx context.Context, pk string, docId string) (* return &response, err } -func setRoom(s *roomStatements, ctx context.Context, pk string, room RoomCosmosData) (*RoomCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, room.ETag) +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, @@ -412,7 +412,7 @@ func (s *roomStatements) UpdateLatestEventNIDs( room.Room.LastEventSentNID = int64(lastEventSentNID) room.Room.StateSnapshotNID = int64(stateSnapshotNID) - _, err = setRoom(s, ctx, room.Pk, room) + _, err = setRoom(s, ctx, room) return err } diff --git a/userapi/storage/accounts/cosmosdb/accounts_table.go b/userapi/storage/accounts/cosmosdb/accounts_table.go index 2e13c4047..9e0669442 100644 --- a/userapi/storage/accounts/cosmosdb/accounts_table.go +++ b/userapi/storage/accounts/cosmosdb/accounts_table.go @@ -126,9 +126,9 @@ func getAccount(s *accountsStatements, ctx context.Context, pk string, docId str return &response, err } -func setAccount(s *accountsStatements, ctx context.Context, pk string, account AccountCosmosData) (*AccountCosmosData, error) { +func setAccount(s *accountsStatements, ctx context.Context, account AccountCosmosData) (*AccountCosmosData, error) { response := AccountCosmosData{} - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, account.ETag) + var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(account.Pk, account.ETag) var _, _, ex = cosmosdbapi.GetClient(s.db.connection).ReplaceDocument( ctx, s.db.cosmosConfig.DatabaseName, @@ -225,7 +225,7 @@ func (s *accountsStatements) updatePassword( response.Account.PasswordHash = passwordHash - var _, exReplace = setAccount(s, ctx, pk, *response) + var _, exReplace = setAccount(s, ctx, *response) if exReplace != nil { return exReplace } @@ -250,7 +250,7 @@ func (s *accountsStatements) deactivateAccount( response.Account.IsDeactivated = true - var _, exReplace = setAccount(s, ctx, pk, *response) + var _, exReplace = setAccount(s, ctx, *response) if exReplace != nil { return exReplace } diff --git a/userapi/storage/accounts/cosmosdb/profile_table.go b/userapi/storage/accounts/cosmosdb/profile_table.go index dbe6bd392..eb8d4efc3 100644 --- a/userapi/storage/accounts/cosmosdb/profile_table.go +++ b/userapi/storage/accounts/cosmosdb/profile_table.go @@ -126,8 +126,8 @@ func getProfile(s *profilesStatements, ctx context.Context, pk string, docId str return &response, err } -func setProfile(s *profilesStatements, ctx context.Context, pk string, profile ProfileCosmosData) (*ProfileCosmosData, error) { - var optionsReplace = cosmosdbapi.GetReplaceDocumentOptions(pk, profile.ETag) +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, @@ -218,7 +218,7 @@ func (s *profilesStatements) setAvatarURL( response.Profile.AvatarURL = avatarURL - var _, exReplace = setProfile(s, ctx, pk, *response) + var _, exReplace = setProfile(s, ctx, *response) if exReplace != nil { return exReplace } @@ -241,7 +241,7 @@ func (s *profilesStatements) setDisplayName( response.Profile.DisplayName = displayName - var _, exReplace = setProfile(s, ctx, pk, *response) + var _, exReplace = setProfile(s, ctx, *response) if exReplace != nil { return exReplace }