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

API patch improvements

Browse Source 
- add PatchObject.CheckIsValid
- use transaction when creating member, as to not create a member if the
patch is invalid
- return edited system in `PATCH /s` endpoint
This commit is contained in:
spiral
2021-04-21 22:57:19 +01:00
parent a2d2036851
commit b34ed5c4c0
10 changed files with 103 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PluralKit.API/Controllers/v1/MemberController.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Threading.Tasks;
using Dapper;
@@ -54,18 +55,28 @@ namespace PluralKit.API
if (memberCount >= memberLimit)
return BadRequest($"Member limit reached ({memberCount} / {memberLimit}).");
var member = await _repo.CreateMember(conn, systemId, properties.Value<string>("name"));
await using var tx = await conn.BeginTransactionAsync();
var member = await _repo.CreateMember(conn, systemId, properties.Value<string>("name"), transaction: tx);
MemberPatch patch;
try
{
patch = JsonModelExt.ToMemberPatch(properties);
patch.CheckIsValid();
}
catch (JsonModelParseError e)
{
await tx.RollbackAsync();
return BadRequest(e.Message);
}
catch (InvalidPatchException e)
{
await tx.RollbackAsync();
return BadRequest($"Request field '{e.Message}' is invalid.");
}
member = await _repo.UpdateMember(conn, member.Id, patch);
member = await _repo.UpdateMember(conn, member.Id, patch, transaction: tx);
await tx.CommitAsync();
return Ok(member.ToJson(User.ContextFor(member)));
}
@@ -85,11 +96,16 @@ namespace PluralKit.API
try
{
patch = JsonModelExt.ToMemberPatch(changes);
patch.CheckIsValid();
}
catch (JsonModelParseError e)
{
return BadRequest(e.Message);
}
catch (InvalidPatchException e)
{
return BadRequest($"Request field is invalid: {e.Message}");
}
var newMember = await _repo.UpdateMember(conn, member.Id, patch);
return Ok(newMember.ToJson(User.ContextFor(newMember)));

8
PluralKit.API/Controllers/v1/SystemController.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -140,13 +141,18 @@ namespace PluralKit.API
try
{
patch = JsonModelExt.ToSystemPatch(changes);
patch.CheckIsValid();
}
catch (JsonModelParseError e)
{
return BadRequest(e.Message);
}
catch (InvalidPatchException e)
{
return BadRequest($"Request field '{e.Message}' is invalid.");
}
await _repo.UpdateSystem(conn, system!.Id, patch);
system = await _repo.UpdateSystem(conn, system!.Id, patch);
return Ok(system.ToJson(User.ContextFor(system)));
}