refactor(ECR-004): Synastry 再拆、Scale 测、Membership 守卫、OpenAPI 与 CI
ci / h5 (push) Canceled after 0s
ci / api (push) Canceled after 0s
ci / ess-docs (push) Canceled after 0s

压合盘贴线文件;补选答单测与 nil 守卫;对齐关键 OpenAPI schemas;加 GitHub Actions 门禁。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jackyu66git
2026-08-05 21:06:14 +08:00
co-authored by Cursor
parent 67701d1f7b
commit 7034c92de7
22 changed files with 1317 additions and 543 deletions
@@ -0,0 +1,157 @@
import type { Ref } from 'vue'
import type { GrowthReport, Profile } from '@yuxingu/types'
import { validateBirth } from '@yuxingu/utils'
import { api } from '../api/client'
import { AnalyticsEvent, track } from '../lib/analytics'
import type { SynastryMainTab } from '../lib/synastryChart'
type NearbyItem = { profile: Profile; distance_km: number }
export type SynastryPageActionRefs = {
loading: Ref<boolean>
adding: Ref<boolean>
paying: Ref<boolean>
inviting: Ref<boolean>
nearbyLoading: Ref<boolean>
error: Ref<string>
nearbyHint: Ref<string>
invitePath: Ref<string>
profiles: Ref<Profile[]>
nearby: Ref<NearbyItem[]>
profileA: Ref<string>
profileB: Ref<string>
asOf: Ref<string>
report: Ref<GrowthReport | null>
ty: Ref<string>
tm: Ref<string>
td: Ref<string>
tName: Ref<string>
mainTab: Ref<SynastryMainTab>
showQuickAdd: Ref<boolean>
}
export function createSynastryPageActions(r: SynastryPageActionRefs) {
async function loadProfiles() {
try {
const res = await api.listProfiles()
r.profiles.value = res.items || []
const self = r.profiles.value.find((p) => p.relation === 'self')
if (self && !r.profileA.value) r.profileA.value = self.id
const other = r.profiles.value.find((p) => p.id !== r.profileA.value)
if (other && !r.profileB.value) r.profileB.value = other.id
} catch (e) {
r.error.value = e instanceof Error ? e.message : '加载档案失败'
}
}
async function addTemp() {
const y = Number(r.ty.value)
const m = Number(r.tm.value)
const d = Number(r.td.value)
const msg = validateBirth(y, m, d)
if (msg) {
r.error.value = msg
return
}
r.adding.value = true
r.error.value = ''
try {
const birth = `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`
const p = await api.createProfile({
relation: 'other',
birth_date: birth,
display_name: r.tName.value || 'TA',
})
await loadProfiles()
r.profileB.value = p.id
r.showQuickAdd.value = false
} catch (e) {
r.error.value = e instanceof Error ? e.message : '添加失败'
} finally {
r.adding.value = false
}
}
async function generate() {
if (!r.profileA.value || !r.profileB.value) return
r.loading.value = true
r.error.value = ''
try {
r.report.value = await api.createSynastry(r.profileA.value, r.profileB.value, r.asOf.value)
r.mainTab.value = 'compare'
track(AnalyticsEvent.SynastryCompleted, { source: 'synastry' })
} catch (e) {
r.error.value = e instanceof Error ? e.message : '合盘失败'
} finally {
r.loading.value = false
}
}
async function createInvite() {
if (!r.profileA.value) return
r.inviting.value = true
r.error.value = ''
try {
const res = await api.createSynastryInvite(r.profileA.value)
r.invitePath.value = res.path
track(AnalyticsEvent.SynastryInviteCreated, { token: res.token })
} catch (e) {
r.error.value = e instanceof Error ? e.message : '邀请失败'
} finally {
r.inviting.value = false
}
}
async function loadNearby() {
r.nearbyLoading.value = true
r.nearbyHint.value = ''
r.error.value = ''
try {
const pos = await new Promise<GeolocationPosition>((resolve, reject) => {
if (!navigator.geolocation) {
reject(new Error('当前环境不支持定位'))
return
}
navigator.geolocation.getCurrentPosition(resolve, reject, { timeout: 8000 })
})
const lat = pos.coords.latitude
const lng = pos.coords.longitude
const self = r.profiles.value.find((p) => p.relation === 'self')
if (self) {
await api.updateProfile(self.id, { geo_lat: lat, geo_lng: lng })
}
const res = await api.listSynastryNearby(lat, lng, 50)
r.nearby.value = res.items || []
r.nearbyHint.value = r.nearby.value.length
? `找到 ${r.nearby.value.length} 位附近可合盘对象。若希望别人看到你,请在档案中开启「位置可见」。`
: '附近暂无已开启位置可见的档案;可邀请好友或手动添加。需要被看到时请在档案开启位置可见。'
track(AnalyticsEvent.SynastryNearbyOpened, { count: r.nearby.value.length })
} catch (e) {
r.nearbyHint.value = e instanceof Error ? e.message : '定位失败,可手动选城后在档案页开启位置'
} finally {
r.nearbyLoading.value = false
}
}
async function buyDeep() {
if (!r.report.value) return
r.paying.value = true
track(AnalyticsEvent.DeepAccessClicked, { surface: 'synastry' })
try {
const { order_id } = await api.createOrder({ kind: 'deep_access', report_id: r.report.value.id })
await api.payMock(order_id)
r.report.value = await api.getReport(r.report.value.id)
track(AnalyticsEvent.PurchaseCompleted, { kind: 'deep_access' })
} catch (e) {
r.error.value = e instanceof Error ? e.message : '支付失败'
} finally {
r.paying.value = false
}
}
function reset() {
r.report.value = null
}
return { loadProfiles, addTemp, generate, createInvite, loadNearby, buyDeep, reset }
}
+73 -250
View File
@@ -1,23 +1,27 @@
import { computed, onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import type { GrowthReport, Profile } from '@yuxingu/types'
import { validateBirth } from '@yuxingu/utils'
import { api } from '../api/client'
import type { WheelPlanet } from '../components/NatalWheel.vue'
import { AnalyticsEvent, track } from '../lib/analytics'
import type { RelationSharePayload } from '../lib/shareLink'
import {
asPlanets,
ascLonFromChart,
birthLabel,
buildRelationSharePayload,
chartBlock,
chartPlanetsFromSummary,
chartTip as chartTipFromCharts,
labelList,
mainTabs,
overlayEntriesFrom,
profileInitial,
relationTypes,
resolveActiveChartKey,
sectionsFromDetail,
type SynastryMainTab,
} from '../lib/synastryChart'
import { createSynastryPageActions } from './synastryPageActions'
export type MainTab = 'compare' | 'composite' | 'davison' | 'marks' | 'overlay'
export const relationTypes = ['伴侣', '朋友', '家人', '其他']
export const mainTabs: { key: MainTab; label: string }[] = [
{ key: 'compare', label: '比较' },
{ key: 'composite', label: '组合' },
{ key: 'davison', label: '时空' },
{ key: 'marks', label: '马克斯' },
{ key: 'overlay', label: '配对' },
]
export type MainTab = SynastryMainTab
export { relationTypes, mainTabs, birthLabel, profileInitial }
export function useSynastryPage() {
const route = useRoute()
@@ -51,22 +55,12 @@ export function useSynastryPage() {
const showQuickAdd = ref(false)
const needsSubTab = computed(() => ['composite', 'davison', 'marks'].includes(mainTab.value))
const pickableProfiles = computed(() => profiles.value.filter((p) => p.id !== profileA.value))
const profileAName = computed(() => {
const p = profiles.value.find((x) => x.id === profileA.value)
return p?.display_name || ''
})
const selfInitial = computed(() => {
const name = profileAName.value || '我'
return name.slice(0, 1)
})
function profileInitial(p: Profile) {
return (p.display_name || 'TA').slice(0, 1)
}
const selfInitial = computed(() => (profileAName.value || '我').slice(0, 1))
const summary = computed(() => (report.value?.summary || {}) as Record<string, unknown>)
const detail = computed(() => (report.value?.detail || null) as Record<string, unknown> | null)
@@ -79,237 +73,66 @@ export function useSynastryPage() {
const loveNote = computed(() => String(summary.value.love_note || ''))
const asOfLabel = computed(() => String(summary.value.as_of || asOf.value))
function asPlanets(raw: unknown): WheelPlanet[] {
if (!Array.isArray(raw)) return []
return raw.map((p) => {
const o = p as Record<string, unknown>
return {
key: String(o.key),
title: String(o.title),
sign: String(o.sign),
degree: String(o.degree),
house: Number(o.house),
lon: Number(o.lon),
element: o.element != null ? String(o.element) : undefined,
modality: o.modality != null ? String(o.modality) : undefined,
}
})
}
function chartPlanets(key: 'chart_a' | 'chart_b'): WheelPlanet[] {
const c = summary.value[key]
if (!c || typeof c !== 'object') return []
return asPlanets((c as { planets?: unknown }).planets)
}
const planetsA = computed(() => chartPlanets('chart_a'))
const planetsB = computed(() => chartPlanets('chart_b'))
const ascA = computed(() => {
const c = summary.value.chart_a as { asc_lon?: number } | undefined
return typeof c?.asc_lon === 'number' ? c.asc_lon : null
})
const ascB = computed(() => {
const c = summary.value.chart_b as { asc_lon?: number } | undefined
return typeof c?.asc_lon === 'number' ? c.asc_lon : null
})
const aspectPreview = computed(() => {
const raw = summary.value.aspects_preview
return Array.isArray(raw) ? (raw as { label: string }[]) : []
})
function chartBlock(key: string): Record<string, unknown> | null {
const c = charts.value[key]
if (!c || typeof c !== 'object') return null
return c as Record<string, unknown>
}
const planetsA = computed(() => chartPlanetsFromSummary(summary.value, 'chart_a'))
const planetsB = computed(() => chartPlanetsFromSummary(summary.value, 'chart_b'))
const ascA = computed(() => ascLonFromChart(summary.value.chart_a))
const ascB = computed(() => ascLonFromChart(summary.value.chart_b))
const aspectPreview = computed(() => labelList(summary.value.aspects_preview))
function chartTip(key: string): string {
const c = chartBlock(key)
return String(c?.tip || '')
return chartTipFromCharts(charts.value, key)
}
const activeChartKey = computed(() => {
if (mainTab.value === 'composite') {
return subTab.value === 'prog' ? 'composite_progressed' : 'composite'
}
if (mainTab.value === 'davison') {
return subTab.value === 'prog' ? 'davison_progressed' : 'davison'
}
if (mainTab.value === 'marks') {
if (subTab.value === 'prog') return 'marks_progressed'
return marksWho.value === 'other' ? 'marks_other' : 'marks_me'
}
return ''
})
const activePlanets = computed(() => {
const c = chartBlock(activeChartKey.value)
return asPlanets(c?.planets)
})
const activeChartKey = computed(() =>
resolveActiveChartKey(mainTab.value, subTab.value, marksWho.value),
)
const activePlanets = computed(() => asPlanets(chartBlock(charts.value, activeChartKey.value)?.planets))
const activeAsc = computed(() => {
const c = chartBlock(activeChartKey.value)
return typeof c?.asc_lon === 'number' ? (c.asc_lon as number) : null
})
const activeAspectPreview = computed(() => {
const c = chartBlock(activeChartKey.value)
const raw = c?.aspects_preview
return Array.isArray(raw) ? (raw as { label: string }[]) : []
const lon = chartBlock(charts.value, activeChartKey.value)?.asc_lon
return typeof lon === 'number' ? lon : null
})
const activeAspectPreview = computed(() =>
labelList(chartBlock(charts.value, activeChartKey.value)?.aspects_preview),
)
const activeChartTip = computed(() => chartTip(activeChartKey.value))
const overlayTip = computed(() => String(chartBlock(charts.value, 'overlay')?.tip || ''))
const overlayEntries = computed(() => overlayEntriesFrom(charts.value))
const fullAspects = computed(() => labelList(detail.value?.aspects))
const sections = computed(() => sectionsFromDetail(detail.value))
const sharePayload = computed(() =>
buildRelationSharePayload(
report.value,
summary.value,
headline.value,
love.value,
friend.value,
marriage.value,
),
)
const overlayTip = computed(() => String(chartBlock('overlay')?.tip || ''))
const overlayEntries = computed(() => {
const raw = chartBlock('overlay')?.entries
return Array.isArray(raw)
? (raw as { planet: string; sign: string; house: number; house_tip: string }[])
: []
})
const fullAspects = computed(() => {
const raw = detail.value?.aspects
return Array.isArray(raw) ? (raw as { label: string }[]) : []
})
const sections = computed(() => {
const raw = detail.value?.sections
return Array.isArray(raw) ? (raw as { title: string; body: string }[]) : []
})
const sharePayload = computed<RelationSharePayload | null>(() => {
if (!report.value) return null
return {
type: 'relation',
me: String(summary.value.me_name || '我'),
other: String(summary.value.other_name || 'TA'),
diff: headline.value,
keywords: [`恋爱${love.value}`, `友情${friend.value}`, `婚姻${marriage.value}`],
}
})
function birthLabel(d?: string) {
if (!d) return ''
return String(d).slice(0, 10)
}
async function loadProfiles() {
try {
const res = await api.listProfiles()
profiles.value = res.items || []
const self = profiles.value.find((p) => p.relation === 'self')
if (self && !profileA.value) profileA.value = self.id
const other = profiles.value.find((p) => p.id !== profileA.value)
if (other && !profileB.value) profileB.value = other.id
} catch (e) {
error.value = e instanceof Error ? e.message : '加载档案失败'
}
}
async function addTemp() {
const y = Number(ty.value)
const m = Number(tm.value)
const d = Number(td.value)
const msg = validateBirth(y, m, d)
if (msg) {
error.value = msg
return
}
adding.value = true
error.value = ''
try {
const birth = `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`
const p = await api.createProfile({
relation: 'other',
birth_date: birth,
display_name: tName.value || 'TA',
})
await loadProfiles()
profileB.value = p.id
showQuickAdd.value = false
} catch (e) {
error.value = e instanceof Error ? e.message : '添加失败'
} finally {
adding.value = false
}
}
async function generate() {
if (!profileA.value || !profileB.value) return
loading.value = true
error.value = ''
try {
report.value = await api.createSynastry(profileA.value, profileB.value, asOf.value)
mainTab.value = 'compare'
track(AnalyticsEvent.SynastryCompleted, { source: 'synastry' })
} catch (e) {
error.value = e instanceof Error ? e.message : '合盘失败'
} finally {
loading.value = false
}
}
async function createInvite() {
if (!profileA.value) return
inviting.value = true
error.value = ''
try {
const res = await api.createSynastryInvite(profileA.value)
invitePath.value = res.path
track(AnalyticsEvent.SynastryInviteCreated, { token: res.token })
} catch (e) {
error.value = e instanceof Error ? e.message : '邀请失败'
} finally {
inviting.value = false
}
}
async function loadNearby() {
nearbyLoading.value = true
nearbyHint.value = ''
error.value = ''
try {
const pos = await new Promise<GeolocationPosition>((resolve, reject) => {
if (!navigator.geolocation) {
reject(new Error('当前环境不支持定位'))
return
}
navigator.geolocation.getCurrentPosition(resolve, reject, { timeout: 8000 })
})
const lat = pos.coords.latitude
const lng = pos.coords.longitude
const self = profiles.value.find((p) => p.relation === 'self')
if (self) {
await api.updateProfile(self.id, { geo_lat: lat, geo_lng: lng })
}
const res = await api.listSynastryNearby(lat, lng, 50)
nearby.value = res.items || []
nearbyHint.value = nearby.value.length
? `找到 ${nearby.value.length} 位附近可合盘对象。若希望别人看到你,请在档案中开启「位置可见」。`
: '附近暂无已开启位置可见的档案;可邀请好友或手动添加。需要被看到时请在档案开启位置可见。'
track(AnalyticsEvent.SynastryNearbyOpened, { count: nearby.value.length })
} catch (e) {
nearbyHint.value = e instanceof Error ? e.message : '定位失败,可手动选城后在档案页开启位置'
} finally {
nearbyLoading.value = false
}
}
async function buyDeep() {
if (!report.value) return
paying.value = true
track(AnalyticsEvent.DeepAccessClicked, { surface: 'synastry' })
try {
const { order_id } = await api.createOrder({ kind: 'deep_access', report_id: report.value.id })
await api.payMock(order_id)
report.value = await api.getReport(report.value.id)
track(AnalyticsEvent.PurchaseCompleted, { kind: 'deep_access' })
} catch (e) {
error.value = e instanceof Error ? e.message : '支付失败'
} finally {
paying.value = false
}
}
function reset() {
report.value = null
}
const { loadProfiles, addTemp, generate, createInvite, loadNearby, buyDeep, reset } =
createSynastryPageActions({
loading,
adding,
paying,
inviting,
nearbyLoading,
error,
nearbyHint,
invitePath,
profiles,
nearby,
profileA,
profileB,
asOf,
report,
ty,
tm,
td,
tName,
mainTab,
showQuickAdd,
})
onMounted(async () => {
await loadProfiles()