From be1afd248e4cc9b03a1e21090602a945af6988b2 Mon Sep 17 00:00:00 2001 From: "Somhairle H. Marisol" Date: Mon, 21 Sep 2026 01:40:10 +0800 Subject: feat(app): 接入 AKShare 行情采集、净值查询与前端净值曲线 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [变更性质] - 本提交完成 3b 行情闭环：真实 AKShare 搜索与净值采集、PostgreSQL 持久化、鉴权 API 与 Fable 前端净值曲线展示。 [新增功能] - API 新增 /api/instruments/search、/api/instruments/{code}/nav 与 nav/refresh 接口，经 Bearer 鉴权调用 AKShare Python 采集器并幂等落库。 - 前端提供基金搜索、精确代码选择、历史净值刷新/重读与 SVG 折线图，token 变更即清空私有结果并失效在途请求。 [实现方案] - MarketData 以 requiredProperty 校验采集器 payload，净值观测按 (code, nav_date) 幂等 upsert 并保留来源与哈希。 - 前端以 requestId 序列守卫 SearchCompleted/SearchFailed/NavCompleted/NavFailed，TokenChanged 同时递增 searchSeq/navSeq 拒绝过期响应；边界解码兼容 F# option 的 {"case":"Some"} 线格式。 [影响范围] - 新增 FundLab.Web.Tests（边界解码、序列失效、图表纯函数共 8 项），扩展 API 测试至 20 项；vite dev 代理 /api 至本地 API。 - 真实 AKShare 端到端依赖本机 akshare 环境，由负责人另行验收；本提交不包含 docs/overnight-progress.md 的现有修改。 --- tests/FundLab.Api.Tests/PersistenceTests.fs | 144 +++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) (limited to 'tests/FundLab.Api.Tests/PersistenceTests.fs') diff --git a/tests/FundLab.Api.Tests/PersistenceTests.fs b/tests/FundLab.Api.Tests/PersistenceTests.fs index f319839..5157a9c 100644 --- a/tests/FundLab.Api.Tests/PersistenceTests.fs +++ b/tests/FundLab.Api.Tests/PersistenceTests.fs @@ -203,7 +203,15 @@ module PersistenceTestHelpers = use services = ServiceCollection().AddGiraffe().BuildServiceProvider() context.RequestServices <- services context.Request.Method <- method - context.Request.Path <- PathString(path) + + let queryIndex = path.IndexOf('?') + + if queryIndex >= 0 then + context.Request.Path <- PathString(path.Substring(0, queryIndex)) + context.Request.QueryString <- QueryString(path.Substring(queryIndex)) + else + context.Request.Path <- PathString(path) + context.Request.Body <- new MemoryStream(Encoding.UTF8.GetBytes(body)) :> Stream @@ -318,6 +326,72 @@ type PersistenceTests(fixture: PostgresFixture) = value.EnsureSchema() value + [] + member _.``market data survives repository restart with source provenance``() = + let code = Random.Shared.Next(0, 1000000).ToString("D6") + let collectedAt = DateTimeOffset(2026, 9, 21, 10, 0, 0, TimeSpan.Zero) + + let searchPayload = + { + Source = "akshare" + SourceRevision = "akshare-test/eastmoney" + CollectedAt = collectedAt + Instruments = + [ + { + Code = code + Name = "测试基金" + FundType = None + } + ] + } + + let navPayload = + { + Source = "akshare" + SourceRevision = "akshare-test/eastmoney" + CollectedAt = collectedAt + Code = code + Observations = + [ + { + NavDate = DateOnly(2026, 9, 18) + PublishedAt = None + Nav = 1.23456789m + AccumulatedNav = Some 2.34567890m + DailyReturn = Some -0.12m + } + ] + } + + let firstRepository = repository () + firstRepository.UpsertInstruments(searchPayload, "search-hash") + firstRepository.UpsertNavObservations(navPayload, "nav-hash") + + let restarted = FundRepository(fixture.ConnectionString) + + match restarted.GetInstrument(code) with + | Some instrument -> + Assert.Equal(code, instrument.Code) + Assert.Equal("测试基金", instrument.Name) + Assert.Equal(None, instrument.FundType) + Assert.Equal("akshare-test/eastmoney", instrument.SourceRevision) + Assert.Equal("search-hash", instrument.SourcePayloadHash) + | None -> + Assert.Fail("instrument was not readable after repository restart") + + match restarted.GetNav(code, Some(DateOnly(2026, 9, 1)), Some(DateOnly(2026, 9, 30))) with + | [ observation ] -> + Assert.Equal(code, observation.Code) + Assert.Equal(DateOnly(2026, 9, 18), observation.NavDate) + Assert.Equal(None, observation.PublishedAt) + Assert.Equal(1.23456789m, observation.Nav) + Assert.Equal(Some 2.34567890m, observation.AccumulatedNav) + Assert.Equal(Some -0.12m, observation.DailyReturn) + Assert.Equal("nav-hash", observation.SourcePayloadHash) + | observations -> + Assert.Fail(sprintf "expected one NAV observation, got %d" observations.Length) + [] member _.``created fund remains readable after repository restart with exact values``() = let command = @@ -583,6 +657,74 @@ type PersistenceTests(fixture: PostgresFixture) = Assert.Contains("\"id\":", readBody) Assert.Contains("\"initialCash\":\"42.10\"", readBody) + [] + member _.``market data API searches exact codes and returns persisted NAV dates``() = + let code = "000001" + let collectedAt = DateTimeOffset(2026, 9, 21, 10, 0, 0, TimeSpan.Zero) + + let searchPayload = + { + Source = "akshare" + SourceRevision = "akshare-test/eastmoney" + CollectedAt = collectedAt + Instruments = + [ + { + Code = code + Name = "华夏成长混合" + FundType = Some "混合型-灵活" + } + ] + } + + let observation = + { + Code = code + NavDate = DateOnly(2026, 9, 18) + PublishedAt = None + Nav = 1.23456789m + AccumulatedNav = None + DailyReturn = Some -0.12m + Source = "akshare" + SourceRevision = "akshare-test/eastmoney" + SourceCollectedAt = collectedAt + SourcePayloadHash = "nav-hash" + FirstSeenAt = collectedAt + LastSeenAt = collectedAt + } + + let marketData = + { new IMarketDataService with + member _.Search _ = Ok searchPayload + member _.RefreshNav _ = Ok [ observation ] + member _.GetNav(_, _, _) = Ok [ observation ] } + + let app = App.createApplicationWithMarketData (repository ()) marketData + + let searchStatus, searchBody = + PersistenceTestHelpers.invoke + app + "GET" + "/api/instruments/search?q=000001" + [ "Authorization", "Bearer test-token" ] + "" + + Assert.Equal(200, searchStatus) + Assert.Contains("\"code\":\"000001\"", searchBody) + Assert.Contains("华夏成长混合", searchBody) + + let navStatus, navBody = + PersistenceTestHelpers.invoke + app + "POST" + "/api/instruments/000001/nav/refresh" + [ "Authorization", "Bearer test-token" ] + "" + + Assert.Equal(200, navStatus) + Assert.Contains("\"navDate\":\"2026-09-18\"", navBody) + Assert.Contains("\"source\":\"akshare\"", navBody) + [] member _.``fund API rejects non-object JSON bodies``() = let app = App.createApplication (repository ()) -- cgit v1.2.3