liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(api): return updated switch in PATCH /switches/:id

Browse Source
This commit is contained in:
spiral 2022-06-11 17:16:53 -04:00
parent 6ed066de29
commit 92ef6d4ec3
No known key found for this signature in database
GPG Key ID: 244A11E4B0BCF40E
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PluralKit.API/Controllers/v2/SwitchControllerV2.cs
View File

@ -183,7 +183,7 @@ public class SwitchControllerV2: PKControllerBase
if (await _repo.GetSwitches(system.Id).Select(x => x.Timestamp).ContainsAsync(value)) if (await _repo.GetSwitches(system.Id).Select(x => x.Timestamp).ContainsAsync(value))
throw Errors.SameSwitchTimestampError; throw Errors.SameSwitchTimestampError;
await _repo.MoveSwitch(sw.Id, value); sw = await _repo.MoveSwitch(sw.Id, value);
var members = await _db.Execute(conn => _repo.GetSwitchMembers(conn, sw.Id)).ToListAsync(); var members = await _db.Execute(conn => _repo.GetSwitchMembers(conn, sw.Id)).ToListAsync();
return Ok(new FrontersReturnNew return Ok(new FrontersReturnNew

5
PluralKit.Core/Database/Repository/ModelRepository.Switch.cs
View File

@ -92,11 +92,11 @@ public partial class ModelRepository
_logger.Information("Updated {SwitchId} members: {Members}", switchId, members); _logger.Information("Updated {SwitchId} members: {Members}", switchId, members);
} }
public async Task MoveSwitch(SwitchId id, Instant time) public async Task<PKSwitch> MoveSwitch(SwitchId id, Instant time)
{ {
_logger.Information("Updated {SwitchId} timestamp: {SwitchTimestamp}", id, time); _logger.Information("Updated {SwitchId} timestamp: {SwitchTimestamp}", id, time);
var query = new Query("switches").AsUpdate(new { timestamp = time }).Where("id", id); var query = new Query("switches").AsUpdate(new { timestamp = time }).Where("id", id);
await _db.ExecuteQuery(query); var ret = await _db.QueryFirst<PKSwitch>(query, extraSql: "returning *");
_ = _dispatch.Dispatch(id, new UpdateDispatchData _ = _dispatch.Dispatch(id, new UpdateDispatchData
{ {
Event = DispatchEvent.UPDATE_SWITCH, Event = DispatchEvent.UPDATE_SWITCH,
@ -105,6 +105,7 @@ public partial class ModelRepository
timestamp = time.FormatExport(), timestamp = time.FormatExport(),
}), }),
}); });
return ret;
} }
public async Task DeleteSwitch(SwitchId id) public async Task DeleteSwitch(SwitchId id)