feat: local Bootstrap Vue ECharts dashboards and universal genealogy write scope
This commit is contained in:
+39
-30
@@ -25,6 +25,9 @@ class WebTests(unittest.TestCase):
|
||||
def setUpClass(cls):
|
||||
app.initialize()
|
||||
cls.admin = app.ACCOUNTS.save({'username': 'admin', 'password': 'test-password', 'role': 'admin'}, None)
|
||||
person = dict(app.FAMILY.person({'name': 'Test account self'}, None), familyId=cls.admin['familyId'])
|
||||
app.save_object('people', person)
|
||||
cls.admin = app.ACCOUNTS.save(dict(cls.admin, personId=person['id']), cls.admin)
|
||||
cls.server = app.ThreadingHTTPServer(('127.0.0.1', 0), app.Handler)
|
||||
cls.thread = threading.Thread(target=cls.server.serve_forever, daemon=True)
|
||||
cls.thread.start()
|
||||
@@ -192,12 +195,11 @@ class WebTests(unittest.TestCase):
|
||||
|
||||
def test_family_graph_validation_and_revision(self):
|
||||
def save(kind,data):
|
||||
return app.FAMILY.save(kind,dict(data,revision=app.setting('familyRevision',0)),self.admin)['item']
|
||||
return self.family_save(kind,data)['item']
|
||||
p=save('person',{'name':'祖辈','biography':'第一行\n第二行'})
|
||||
q=save('person',{'name':'子辈'})
|
||||
r=save('person',{'name':'孙辈'})
|
||||
first=save('link',{'fromId':p['id'],'toId':q['id'],'kind':'parent'})
|
||||
save('link',{'fromId':q['id'],'toId':r['id'],'kind':'parent'})
|
||||
q=save('person',{'name':'子辈','relativeId':p['id']})
|
||||
r=save('person',{'name':'孙辈','relativeId':q['id']})
|
||||
first=next(e for e in app.objects('family_links') if e['fromId']==p['id'] and e['toId']==q['id'])
|
||||
for value in [{'fromId':r['id'],'toId':p['id'],'kind':'parent'},
|
||||
{'fromId':p['id'],'toId':p['id'],'kind':'parent'},
|
||||
{'fromId':p['id'],'toId':r['id'],'kind':'spouse'},
|
||||
@@ -209,9 +211,8 @@ class WebTests(unittest.TestCase):
|
||||
save('person',{'name':'错误日期','birthDate':'2026-02-30'})
|
||||
with self.assertRaises(app.Problem):
|
||||
save('person',{'name':'错误日期','birthDate':'2020-01-01','deathDate':'1900-01-01','lifeStatus':'deceased'})
|
||||
save('link',dict(first,active=False))
|
||||
self.assertFalse(app.get_object('family_links',first['id'])['active'])
|
||||
save('link',dict(first,active=True))
|
||||
with self.assertRaises(app.Problem):save('link',dict(first,active=False))
|
||||
self.assertTrue(app.get_object('family_links',first['id'])['active'])
|
||||
save('person',dict(p,archived=True))
|
||||
self.assertTrue(app.get_object('people',p['id'])['archived'])
|
||||
save('person',dict(p,archived=False))
|
||||
@@ -281,7 +282,7 @@ class WebTests(unittest.TestCase):
|
||||
def test_family_event_draft_publish_archive_and_restore(self):
|
||||
def save(data):
|
||||
return app.FAMILY.save('event',dict(data,revision=app.setting('familyRevision',0)),self.admin)['item']
|
||||
p=app.FAMILY.save('person',{'name':'Event person','revision':app.setting('familyRevision',0)},self.admin)['item']
|
||||
p=self.family_save('person',{'name':'Event person'})['item']
|
||||
reader={'role':'member','familyAccess':'read','personId':p['id']}
|
||||
e=save({'title':'First event','eventDate':'2024-02-10','summary':'Summary','body':'Line one\nLine two','personIds':[p['id'],p['id']]})
|
||||
self.assertEqual(e['status'],'draft');self.assertEqual(e['personIds'],[p['id']])
|
||||
@@ -337,16 +338,18 @@ class WebTests(unittest.TestCase):
|
||||
self.assertEqual(event['publishedAt'],published);self.assertEqual(event['createdAt'],created)
|
||||
|
||||
def test_biological_birth_order_checked_on_link_and_person_changes(self):
|
||||
def save(kind,data):return app.FAMILY.save(kind,dict(data,revision=app.setting('familyRevision',0)),self.admin)['item']
|
||||
def save(kind,data):return self.family_save(kind,data)['item']
|
||||
parent=save('person',{'name':'Parent','birthDate':'1980-01-01'})
|
||||
child=save('person',{'name':'Child','birthDate':'2000-01-01'})
|
||||
relation=save('link',{'fromId':parent['id'],'toId':child['id'],'kind':'parent','lineage':'biological'})
|
||||
child=save('person',{'name':'Child','birthDate':'2000-01-01','relativeId':parent['id']})
|
||||
edge=next(e for e in app.objects('family_links') if e['toId']==child['id'])
|
||||
relation=save('link',dict(edge,lineage='biological'))
|
||||
for person,date in [(parent,'2000-01-01'),(parent,'2001-01-01'),(child,'1979-01-01')]:
|
||||
revision=app.setting('familyRevision',0)
|
||||
with self.assertRaises(app.Problem):save('person',dict(person,birthDate=date))
|
||||
self.assertEqual(app.setting('familyRevision',0),revision)
|
||||
self.assertEqual(app.get_object('people',person['id'])['birthDate'],person['birthDate'])
|
||||
save('link',dict(relation,active=False))
|
||||
# Legacy inactive data can exist; seed it to exercise current birth validation.
|
||||
app.save_object('family_links',dict(relation,lineage='adoptive'))
|
||||
save('person',dict(parent,birthDate='2001-01-01'))
|
||||
with self.assertRaises(app.Problem):save('link',dict(relation,active=True))
|
||||
save('link',dict(relation,active=True,lineage='adoptive'))
|
||||
@@ -440,28 +443,30 @@ class WebTests(unittest.TestCase):
|
||||
self.assertEqual(app.recording_state(camera, True, True), 'paused')
|
||||
|
||||
def family_save(self, kind, data):
|
||||
if kind == 'person' and not data.get('id'):
|
||||
data = dict({'relativeId':self.admin['personId'], 'relativeKind':'child'}, **data)
|
||||
return app.FAMILY.save(kind, dict(data, revision=app.setting('familyRevision', 0)), self.admin)
|
||||
|
||||
def test_history_records_before_after_and_restore_as_new_version(self):
|
||||
first = self.family_save('person', {'name': 'History original', 'biography': 'Original story'})
|
||||
second = self.family_save('person', dict(first['item'], name='History changed'))
|
||||
change = app.FAMILY.change(self.admin, second['revision'])
|
||||
change = app.FAMILY.change(self.admin, second['changeRevision'])
|
||||
self.assertEqual(change['before']['name'], 'History original')
|
||||
self.assertEqual(change['after']['name'], 'History changed')
|
||||
restored = app.FAMILY.restore({'changeRevision': second['revision'], 'side': 'before',
|
||||
restored = app.FAMILY.restore({'changeRevision': second['changeRevision'], 'side': 'before',
|
||||
'revision': app.setting('familyRevision')}, self.admin)
|
||||
self.assertEqual(restored['item']['name'], 'History original')
|
||||
self.assertGreater(restored['revision'], second['revision'])
|
||||
entries = app.FAMILY.history(self.admin, 'person', first['item']['id'])['items']
|
||||
self.assertEqual(len(entries), 3)
|
||||
self.assertEqual(entries[0]['restoredFrom'], second['revision'])
|
||||
self.assertEqual(app.FAMILY.change(self.admin, second['revision']), change)
|
||||
self.assertEqual(entries[0]['restoredFrom'], second['changeRevision'])
|
||||
self.assertEqual(app.FAMILY.change(self.admin, second['changeRevision']), change)
|
||||
|
||||
def test_history_rejects_stale_restore_without_writing(self):
|
||||
first = self.family_save('person', {'name': 'Stale restore'})
|
||||
second = self.family_save('person', dict(first['item'], name='Latest'))
|
||||
with self.assertRaises(app.Problem) as caught:
|
||||
app.FAMILY.restore(dict(changeRevision=first['revision'], side='after', revision=first['revision']), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=first['changeRevision'], side='after', revision=first['revision']), self.admin)
|
||||
self.assertEqual(caught.exception.status, 409)
|
||||
self.assertEqual(app.get_object('people', first['item']['id'])['name'], 'Latest')
|
||||
self.assertEqual(app.setting('familyRevision'), second['revision'])
|
||||
@@ -469,32 +474,36 @@ class WebTests(unittest.TestCase):
|
||||
def test_restore_revalidates_current_birth_order(self):
|
||||
old = self.family_save('person', {'name': 'Restore parent', 'birthDate': '1980-01-01'})
|
||||
parent = self.family_save('person', dict(old['item'], birthDate='1960-01-01'))['item']
|
||||
child = self.family_save('person', {'name': 'Restore child', 'birthDate': '1970-01-01'})['item']
|
||||
self.family_save('link', dict(fromId=parent['id'], toId=child['id'], kind='parent', lineage='biological'))
|
||||
child = self.family_save('person', {'name': 'Restore child', 'birthDate': '1970-01-01', 'relativeId':parent['id']})['item']
|
||||
edge=next(e for e in app.objects('family_links') if e['toId']==child['id'])
|
||||
self.family_save('link', dict(edge, lineage='biological'))
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.restore(dict(changeRevision=old['revision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=old['changeRevision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
self.assertEqual(app.get_object('people', parent['id'])['birthDate'], '1960-01-01')
|
||||
|
||||
def test_restore_link_cannot_create_new_cycle(self):
|
||||
a = self.family_save('person', {'name': 'Cycle A'})['item']
|
||||
b = self.family_save('person', {'name': 'Cycle B'})['item']
|
||||
old = self.family_save('link', dict(fromId=a['id'], toId=b['id'], kind='parent'))
|
||||
self.family_save('link', dict(old['item'], active=False))
|
||||
self.family_save('link', dict(fromId=b['id'], toId=a['id'], kind='parent'))
|
||||
b = self.family_save('person', {'name': 'Cycle B','relativeId':a['id']})['item']
|
||||
edge=next(e for e in app.objects('family_links') if e['toId']==b['id'])
|
||||
old = self.family_save('link', dict(edge, note='History'))
|
||||
# Seed a changed legacy graph; the current API disallows this displacement.
|
||||
app.save_object('family_links',dict(old['item'],active=False))
|
||||
inverse=app.FAMILY.link(dict(fromId=b['id'],toId=a['id'],kind='parent'),None)
|
||||
app.save_object('family_links',dict(inverse,familyId=self.admin['familyId']))
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.restore(dict(changeRevision=old['revision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=old['changeRevision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
self.assertFalse(app.get_object('family_links', old['item']['id'])['active'])
|
||||
|
||||
def test_restore_event_preserves_first_publication_and_validates_scope(self):
|
||||
draft = self.family_save('event', dict(title='Restored story', eventDate='2020-01-01', body='Draft', status='draft'))
|
||||
published = self.family_save('event', dict(draft['item'], body='Published', status='published'))
|
||||
restored = app.FAMILY.restore(dict(changeRevision=draft['revision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
restored = app.FAMILY.restore(dict(changeRevision=draft['changeRevision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
self.assertEqual(restored['item']['status'], 'draft')
|
||||
self.assertEqual(restored['item']['publishedAt'], published['item']['publishedAt'])
|
||||
self.assertNotIn(draft['item']['id'], [e['id'] for e in app.FAMILY.snapshot(dict(role='member', familyAccess='read'))['events']])
|
||||
for side in ['before', 'invalid']:
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.restore(dict(changeRevision=draft['revision'], side=side, revision=app.setting('familyRevision')), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=draft['changeRevision'], side=side, revision=app.setting('familyRevision')), self.admin)
|
||||
|
||||
def test_history_pagination_is_complete_and_omits_story_bodies(self):
|
||||
item = self.family_save('person', {'name': 'Pagination', 'biography': 'Private full story'})['item']
|
||||
@@ -515,7 +524,7 @@ class WebTests(unittest.TestCase):
|
||||
app.DB.execute('INSERT INTO sessions VALUES (?,?,?)', (hashlib.sha256(token.encode()).hexdigest(), time.time()+3600, reader['id']))
|
||||
app.DB.commit()
|
||||
path = '/api/family/history?kind=person&id=' + item['item']['id']
|
||||
for target in [path, '/api/family/change?revision=' + str(item['revision'])]:
|
||||
for target in [path, '/api/family/change?revision=' + str(item['changeRevision'])]:
|
||||
self.assertEqual(self.request(target, token=token)[0], 403)
|
||||
self.assertEqual(self.request(target, authenticated=False)[0], 401)
|
||||
self.assertEqual(self.request(target)[0], 200)
|
||||
@@ -541,7 +550,7 @@ class WebTests(unittest.TestCase):
|
||||
revision = app.setting('familyRevision', 0); barrier = threading.Barrier(2)
|
||||
def save(index):
|
||||
barrier.wait()
|
||||
try:app.FAMILY.save('person', dict(name='Concurrent '+str(index), revision=revision), self.admin);return 200
|
||||
try:app.FAMILY.save('person', dict(name='Concurrent '+str(index), revision=revision, relativeId=self.admin['personId'], relativeKind='child'), self.admin);return 200
|
||||
except app.Problem as e:return e.status
|
||||
with ThreadPoolExecutor(max_workers=2) as pool:self.assertEqual(sorted(pool.map(save, range(2))), [200, 409])
|
||||
self.assertEqual(app.setting('familyRevision'), revision+1)
|
||||
|
||||
Reference in New Issue
Block a user