1.应用详情页面时间显示不对,显0-0-0 0:0:0 2.提供应用删除功能,删除前需要判断应用下面没有任何关联订单和凭证等信息
This commit is contained in:
1 parent
101140f3c2
commit
6321cde4c0
8 files changed
+117
-12
No files matched your search
@@ -57,6 +57,9 @@ public class RentalBusinessTest {
|
||||
RentalController controller = new RentalController(
|
||||
store, null, identity, orders, funds, reviews, tasks, null, null);
|
||||
Map<String, Object> result = (Map<String, Object>) controller.appDetail(app).get("data");
|
||||
Map<String, Object> appDetail = (Map<String, Object>) result.get("app");
|
||||
assertEquals(time(store.get("app", app, false).get("created_at")).toEpochMilli(),
|
||||
((Number) appDetail.get("created_at")).longValue());
|
||||
List<Map<String, Object>> credentials =
|
||||
(List<Map<String, Object>>) result.get("credentials");
|
||||
assertEquals(1, credentials.size());
|
||||
@@ -70,6 +73,37 @@ public class RentalBusinessTest {
|
||||
}
|
||||
}
|
||||
|
||||
/** 订单或任意历史凭证均阻止物理删除,无依赖空应用可删除且写审计。 */
|
||||
@Test
|
||||
public void appDeletionRejectsEveryOrderAndCredentialState() {
|
||||
try {
|
||||
long empty = store.insert("app", map("user_id", 10, "name", "empty", "status", "ACTIVE"));
|
||||
tx.execute(status -> { rentalDeletion().deleteApp(empty, 10L); return null; });
|
||||
assertNull(store.one("SELECT id FROM rent_app WHERE id=?", empty));
|
||||
assertEquals(1, store.rows("SELECT id FROM rent_event WHERE object_type='APP' AND object_id=? AND action='DELETE'", empty).size());
|
||||
|
||||
long withCredential = store.insert("app", map("user_id", 10, "name", "credential", "status", "ACTIVE"));
|
||||
tx.execute(status -> identity.issue("APP", withCredential, 10));
|
||||
for (String credentialStatus : Arrays.asList("ACTIVE", "VERIFY_ONLY", "REVOKED")) {
|
||||
store.execute("UPDATE rent_credential SET status=? WHERE owner_type='APP' AND owner_id=?", credentialStatus, withCredential);
|
||||
expectFailure(() -> tx.execute(status -> { rentalDeletion().deleteApp(withCredential, 10L); return null; }));
|
||||
}
|
||||
|
||||
long withOrder = store.insert("app", map("user_id", 10, "name", "order", "status", "ACTIVE"));
|
||||
Map<String, Object> order = tx.execute(status -> orders.create(withOrder, 10,
|
||||
map("package_id", product, "merchant_order_no", "delete-test", "receiver_address", ADDRESS)));
|
||||
tx.execute(status -> { orders.cancel(number(order, "id"), 10); return null; });
|
||||
expectFailure(() -> tx.execute(status -> { rentalDeletion().deleteApp(withOrder, 10L); return null; }));
|
||||
|
||||
long foreign = store.insert("app", map("user_id", 20, "name", "foreign", "status", "ACTIVE"));
|
||||
expectFailure(() -> tx.execute(status -> { rentalDeletion().deleteApp(foreign, 10L); return null; }));
|
||||
} catch (Exception ex) {
|
||||
throw new AssertionError(ex);
|
||||
}
|
||||
}
|
||||
|
||||
private RentalProvisioning rentalDeletion() { return new RentalProvisioning(store, orders); }
|
||||
|
||||
@Before
|
||||
public void setup() throws Exception {
|
||||
JdbcDataSource source = new JdbcDataSource();
|
||||
|
||||
Reference in new issue
Block a user