Add custom campaign roll composer
This commit is contained in:
@@ -75,6 +75,19 @@ public sealed class RollVisibilityApiTests : ApiTestBase
|
||||
var invalidVisibility = await playerClient.PostAsJsonAsync($"/api/skills/{skill.Id}/roll", new RollSkillRequest("hidden"));
|
||||
Assert.Equal(HttpStatusCode.BadRequest, invalidVisibility.StatusCode);
|
||||
|
||||
var customRoll = await PostAsync<CustomRollRequest, RollResult>(playerClient, $"/api/characters/{playerCharacter.Id}/custom-rolls", new("1D+2", "public"));
|
||||
Assert.Equal(Guid.Empty, customRoll.SkillId);
|
||||
|
||||
var customRollLogPage = await GetAsync<CampaignLogPage>(observerClient, $"/api/campaigns/{campaign.Id}/log/page");
|
||||
Assert.Equal(2, customRollLogPage.Entries.Length);
|
||||
Assert.Equal("Custom roll", customRollLogPage.Entries[1].SkillName);
|
||||
|
||||
var invalidCustomRollResponse = await playerClient.PostAsJsonAsync($"/api/characters/{playerCharacter.Id}/custom-rolls", new CustomRollRequest("bad", "public"));
|
||||
Assert.Equal(HttpStatusCode.BadRequest, invalidCustomRollResponse.StatusCode);
|
||||
var invalidCustomRoll = await invalidCustomRollResponse.Content.ReadFromJsonAsync<ApiError>();
|
||||
Assert.NotNull(invalidCustomRoll);
|
||||
Assert.Equal("invalid_expression", invalidCustomRoll.Code);
|
||||
|
||||
using var anonymousClient = factory.CreateClient(new() { AllowAutoRedirect = false });
|
||||
var unauthorizedCampaignCreate = await anonymousClient.PostAsJsonAsync("/api/campaigns", new CreateCampaignRequest("Nope", "d6"));
|
||||
Assert.Equal(HttpStatusCode.Unauthorized, unauthorizedCampaignCreate.StatusCode);
|
||||
|
||||
@@ -225,4 +225,43 @@ public sealed class ServiceSkillRollTests
|
||||
Assert.False(outsiderPublicDetail.Succeeded);
|
||||
Assert.Equal("roll_not_found", outsiderPublicDetail.Error!.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CustomRoll_UsesCampaignRuleset_AndAppearsAsCustomRollInLog()
|
||||
{
|
||||
using var harness = ServiceTestSupport.CreateHarness(20);
|
||||
var service = harness.Service;
|
||||
|
||||
service.Register("gm-custom", "Password123", "GM");
|
||||
service.Register("owner-custom", "Password123", "Owner");
|
||||
service.Register("other-custom", "Password123", "Other");
|
||||
|
||||
var gmSession = ServiceTestSupport.GetValue(service.Login("gm-custom", "Password123")).SessionToken;
|
||||
var ownerSession = ServiceTestSupport.GetValue(service.Login("owner-custom", "Password123")).SessionToken;
|
||||
var otherSession = ServiceTestSupport.GetValue(service.Login("other-custom", "Password123")).SessionToken;
|
||||
|
||||
var campaign = ServiceTestSupport.GetValue(service.CreateCampaign(gmSession, "Custom", "dnd5e"));
|
||||
var character = ServiceTestSupport.GetValue(service.CreateCharacter(ownerSession, "Hero", campaign.Id));
|
||||
|
||||
var invalidExpression = service.RollCustom(ownerSession, character.Id, "bad", "public");
|
||||
Assert.False(invalidExpression.Succeeded);
|
||||
Assert.Equal("invalid_expression", invalidExpression.Error!.Code);
|
||||
|
||||
var forbiddenRoll = service.RollCustom(otherSession, character.Id, "1d20+5", "public");
|
||||
Assert.False(forbiddenRoll.Succeeded);
|
||||
Assert.Equal("forbidden", forbiddenRoll.Error!.Code);
|
||||
|
||||
var customRoll = ServiceTestSupport.GetValue(service.RollCustom(ownerSession, character.Id, "1d20+5", "private"));
|
||||
Assert.Equal(Guid.Empty, customRoll.SkillId);
|
||||
Assert.StartsWith("1d20+5 => ", customRoll.Breakdown, StringComparison.Ordinal);
|
||||
|
||||
var logPage = ServiceTestSupport.GetValue(service.GetCampaignLogPage(gmSession, campaign.Id, limit: 5));
|
||||
var entry = Assert.Single(logPage.Entries);
|
||||
Assert.Equal("Custom roll", entry.SkillName);
|
||||
Assert.Equal("Private (GM view)", entry.VisibilityLabel);
|
||||
Assert.Contains("n20", Assert.IsType<string[]>(entry.EventBadges));
|
||||
|
||||
var log = ServiceTestSupport.GetValue(service.GetCampaignLog(ownerSession, campaign.Id));
|
||||
Assert.Equal("Custom roll", Assert.Single(log).SkillName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,7 @@ public sealed class WorkspaceQueryServiceTests
|
||||
|
||||
Assert.Equal(401, exception.StatusCode);
|
||||
Assert.Equal("You must be logged in.", exception.Message);
|
||||
Assert.Equal("unauthorized", exception.ErrorCode);
|
||||
}
|
||||
|
||||
private static WorkspaceSessionTokenAccessor CreateSessionTokenAccessor(string sessionToken)
|
||||
@@ -95,6 +96,7 @@ public sealed class WorkspaceQueryServiceTests
|
||||
public ServiceResult<bool> DeleteSkill(string sessionToken, Guid skillId) => throw new NotSupportedException();
|
||||
public ServiceResult<CharacterSheet> GetCharacterSheet(string sessionToken, Guid characterId) => throw new NotSupportedException();
|
||||
public ServiceResult<RollResult> RollSkill(string sessionToken, Guid skillId, string visibility) => throw new NotSupportedException();
|
||||
public ServiceResult<RollResult> RollCustom(string sessionToken, Guid characterId, string expression, string visibility) => throw new NotSupportedException();
|
||||
public ServiceResult<IReadOnlyList<CampaignLogEntry>> GetCampaignLog(string sessionToken, Guid campaignId) => throw new NotSupportedException();
|
||||
public ServiceResult<CampaignLogPage> GetCampaignLogPage(string sessionToken, Guid campaignId, Guid? afterRollId = null, int? limit = null) => throw new NotSupportedException();
|
||||
public ServiceResult<CampaignRollDetail> GetRollDetail(string sessionToken, Guid rollId) => throw new NotSupportedException();
|
||||
|
||||
Reference in New Issue
Block a user