|
@@ -71,7 +71,7 @@ public class ActivityControllerTest {
|
|
|
Page<Activity> page = new Page<>(1, 10, 2);
|
|
Page<Activity> page = new Page<>(1, 10, 2);
|
|
|
page.setRecords(records);
|
|
page.setRecords(records);
|
|
|
|
|
|
|
|
- when(activityService.list(isNull(), eq(1), eq(10), isNull()))
|
|
|
|
|
|
|
+ when(activityService.list(isNull(), isNull(), eq(false), eq(1), eq(10), isNull(), isNull()))
|
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
|
|
data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
|
|
@@ -82,7 +82,7 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.list(params, null);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.list(params, null, null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertNotNull(result.getData());
|
|
assertNotNull(result.getData());
|
|
|
}
|
|
}
|
|
@@ -98,7 +98,7 @@ public class ActivityControllerTest {
|
|
|
mockActivity(3L, "体质检测", "published", "body")
|
|
mockActivity(3L, "体质检测", "published", "body")
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
- when(activityService.list(eq("body"), eq(1), eq(10), isNull()))
|
|
|
|
|
|
|
+ when(activityService.list(eq("body"), isNull(), eq(false), eq(1), eq(10), isNull(), isNull()))
|
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
|
|
data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
|
|
@@ -109,18 +109,18 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.list(params, null);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.list(params, null, null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
@Test
|
|
|
- public void list_FilterByActivityType() {
|
|
|
|
|
|
|
+ public void list_FilterByStatus() {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
- params.put("activityType", "campaign");
|
|
|
|
|
|
|
+ params.put("status", "ended");
|
|
|
params.put("page", 1);
|
|
params.put("page", 1);
|
|
|
params.put("size", 10);
|
|
params.put("size", 10);
|
|
|
|
|
|
|
|
- when(activityService.list(isNull(), eq(1), eq(10), isNull()))
|
|
|
|
|
|
|
+ when(activityService.list(isNull(), eq("ended"), eq(false), eq(1), eq(10), isNull(), isNull()))
|
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("records", Collections.emptyList());
|
|
data.put("records", Collections.emptyList());
|
|
@@ -131,7 +131,7 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.list(params, null);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.list(params, null, null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(0, ((List<?>)result.getData().get("records")).size());
|
|
assertEquals(0, ((List<?>)result.getData().get("records")).size());
|
|
|
}
|
|
}
|
|
@@ -142,12 +142,12 @@ public class ActivityControllerTest {
|
|
|
params.put("page", 1);
|
|
params.put("page", 1);
|
|
|
params.put("size", 10);
|
|
params.put("size", 10);
|
|
|
|
|
|
|
|
- // 登录用户可看到自己的私有活动
|
|
|
|
|
|
|
+ // 登录用户可看到自己的私有活动(管理员视角:mine=true 时按发布者过滤)
|
|
|
List<Activity> records = Collections.singletonList(
|
|
List<Activity> records = Collections.singletonList(
|
|
|
mockActivity(5L, "内部活动", "draft", "mind")
|
|
mockActivity(5L, "内部活动", "draft", "mind")
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
- when(activityService.list(isNull(), eq(1), eq(10), eq(99L)))
|
|
|
|
|
|
|
+ when(activityService.list(isNull(), isNull(), eq(true), eq(1), eq(10), eq(99L), eq("activity_admin")))
|
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
.thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
|
|
data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
|
|
@@ -158,7 +158,7 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.list(params, 99L);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.list(params, 99L, "activity_admin");
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(1, ((List<?>)result.getData().get("records")).size());
|
|
assertEquals(1, ((List<?>)result.getData().get("records")).size());
|
|
|
}
|
|
}
|