feat(oa): add instance comment create list and revoke service
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
ea8420b648
commit
c66bfc75c0
2 files changed
+317
No files matched your search
@@ -1,5 +1,7 @@
|
||||
"""OA 实例评论:附件枚举与引用校验"""
|
||||
import json
|
||||
import unittest
|
||||
from datetime import datetime
|
||||
|
||||
from app.services.oa_instance_comment import (
|
||||
enumerate_form_attachments,
|
||||
@@ -61,3 +63,138 @@ class TestNormalizeAttachmentRefs(unittest.TestCase):
|
||||
form,
|
||||
[{"fieldKey": "files", "url": "https://evil/x.pdf"}],
|
||||
)
|
||||
|
||||
|
||||
class TestCommentCrud(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from app.models.models import OaAppVersion, OaInstance, OaInstanceComment, SysUser
|
||||
|
||||
self.engine = create_engine("sqlite:///:memory:")
|
||||
OaAppVersion.__table__.create(self.engine)
|
||||
OaInstance.__table__.create(self.engine)
|
||||
OaInstanceComment.__table__.create(self.engine)
|
||||
SysUser.__table__.create(self.engine)
|
||||
Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self.db = Session()
|
||||
now = datetime.now()
|
||||
schema = {
|
||||
"rule": [
|
||||
{"type": "upload", "field": "files", "title": "附件"},
|
||||
]
|
||||
}
|
||||
self.db.add(
|
||||
OaAppVersion(
|
||||
id="v1",
|
||||
app_id="app1",
|
||||
version_no=1,
|
||||
status="published",
|
||||
is_latest_published="1",
|
||||
form_schema_json=json.dumps(schema, ensure_ascii=False),
|
||||
flow_tree_json="{}",
|
||||
advanced_settings_json="{}",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
OaInstance(
|
||||
id="i1",
|
||||
app_id="app1",
|
||||
app_version_id="v1",
|
||||
title="t",
|
||||
status="running",
|
||||
initiator_user_id="u0",
|
||||
initiator_dept_id="d1",
|
||||
form_data_json=json.dumps(
|
||||
{"files": [{"url": "https://x/a.pdf", "name": "a.pdf"}]},
|
||||
ensure_ascii=False,
|
||||
),
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="d1",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
current_round=1,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
SysUser(
|
||||
id="u1",
|
||||
tenant_no="zkxw",
|
||||
user_no="u1",
|
||||
nick_name="张三",
|
||||
email="",
|
||||
phone_no="",
|
||||
password="",
|
||||
status="1",
|
||||
create_dept_id="",
|
||||
del_flag=0,
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
)
|
||||
)
|
||||
self.db.commit()
|
||||
|
||||
def test_create_list_revoke(self):
|
||||
from app.services import oa_instance_comment as svc
|
||||
|
||||
row = svc.create_comment(
|
||||
self.db,
|
||||
instance_id="i1",
|
||||
tenant_no="zkxw",
|
||||
user_id="u1",
|
||||
dept_id="d1",
|
||||
content="请看附件",
|
||||
attachment_refs=[{"fieldKey": "files", "url": "https://x/a.pdf"}],
|
||||
)
|
||||
self.assertEqual(row["status"], "normal")
|
||||
self.assertTrue(row["canRevoke"])
|
||||
self.assertEqual(len(row["attachmentRefs"]), 1)
|
||||
|
||||
listed = svc.list_comments(
|
||||
self.db, instance_id="i1", tenant_no="zkxw", viewer_user_id="u1"
|
||||
)
|
||||
self.assertEqual(len(listed), 1)
|
||||
|
||||
revoked = svc.revoke_comment(
|
||||
self.db,
|
||||
instance_id="i1",
|
||||
comment_id=row["id"],
|
||||
tenant_no="zkxw",
|
||||
user_id="u1",
|
||||
)
|
||||
self.assertEqual(revoked["status"], "revoked")
|
||||
self.assertFalse(revoked["canRevoke"])
|
||||
|
||||
again = svc.revoke_comment(
|
||||
self.db,
|
||||
instance_id="i1",
|
||||
comment_id=row["id"],
|
||||
tenant_no="zkxw",
|
||||
user_id="u1",
|
||||
)
|
||||
self.assertEqual(again["status"], "revoked")
|
||||
|
||||
def test_cannot_comment_when_not_running(self):
|
||||
from app.services import oa_instance_comment as svc
|
||||
from app.services.oa_engine import OaEngineError
|
||||
from app.models.models import OaInstance
|
||||
|
||||
inst = self.db.query(OaInstance).filter(OaInstance.id == "i1").one()
|
||||
inst.status = "completed"
|
||||
self.db.commit()
|
||||
with self.assertRaises(OaEngineError):
|
||||
svc.create_comment(
|
||||
self.db,
|
||||
instance_id="i1",
|
||||
tenant_no="zkxw",
|
||||
user_id="u1",
|
||||
dept_id="d1",
|
||||
content="x",
|
||||
attachment_refs=None,
|
||||
)
|
||||
Reference in new issue
Block a user