Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/schedule/group/TestEditGroupSchedule.java

@@ -52,10 +52,7 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
                 body.put("applyRestRule", false);
                 body.put("applyRestRule", false);
                 body.put("scheduleId", scheduleId);
                 body.put("scheduleId", scheduleId);
                 //获取下周四某个时间点的开始时间戳
                 //获取下周四某个时间点的开始时间戳
-                Date getWeekStartDayData = CommUtil.getStartOfDateWeek(now);//获取本周的第一天
-                Date getNextWeekXDayData = CommUtil.addNDays(getWeekStartDayData, 10);
-                String getNextWeekXDayDataS = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData.getTime());
-                String startStamp = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS + " " + "13:30");
+                String startStamp = getWholeHourTimeStamp(10,"13:30");
                 body.put("startTime", startStamp);
                 body.put("startTime", startStamp);
 
 
                 body.put("chiefCoachId", chiefCoachIdS);
                 body.put("chiefCoachId", chiefCoachIdS);
@@ -103,10 +100,7 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
                 body.put("applyRestRule", true);//改的时日程当前及后续
                 body.put("applyRestRule", true);//改的时日程当前及后续
                 body.put("scheduleId", scheduleId);
                 body.put("scheduleId", scheduleId);
                 //获取下周二某个时间点的开始时间戳
                 //获取下周二某个时间点的开始时间戳
-                Date getWeekStartDayData = CommUtil.getStartOfDateWeek(now);
-                Date getNextWeekXDayData = CommUtil.addNDays(getWeekStartDayData, 8);
-                String getNextWeekXDayDataS = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData.getTime());
-                String startStamp1 = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS + " " + "13:00"); //和创建时间一致，不修改时间
+                String startStamp1 =getWholeHourTimeStamp(8,"13:00");
                 body.put("startTime", startStamp1);
                 body.put("startTime", startStamp1);
 
 
                 body.put("chiefCoachId", chiefCoachIdS);
                 body.put("chiefCoachId", chiefCoachIdS);
@@ -129,9 +123,7 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
 
 
                 //查看下周三课次是否同步被修改
                 //查看下周三课次是否同步被修改
                 Set<String> scheduleIdX = groupScheduleTools.getTableDate(9);
                 Set<String> scheduleIdX = groupScheduleTools.getTableDate(9);
-                Date getNextWeekXDayData2 = CommUtil.addNDays(getWeekStartDayData, 9);
-                String getNextWeekXDayDataS2 = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData2.getTime());
-                String startStamp2 = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS2 + " " + "13:00"); //和创建时间一致，不修改时间
+                String startStamp2 = getWholeHourTimeStamp(9,"13:00");
                 if (!scheduleIdX.isEmpty()) {
                 if (!scheduleIdX.isEmpty()) {
                     scheduleIdX.stream().forEach(scheduleId1 -> {
                     scheduleIdX.stream().forEach(scheduleId1 -> {
                         //编辑成功后check同规则中下周三课次详情修改内容是否同步成功
                         //编辑成功后check同规则中下周三课次详情修改内容是否同步成功
@@ -142,6 +134,41 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
 
 
             });
             });
         }
         }
+        //获取下周一的课次ID，查看下周一课次是否还是原来的（没被修改，还是原来的规则）
+        Set<String> scheduleId1 = groupScheduleTools.getTableDate(7);
+        String startStamp3=getWholeHourTimeStamp(7,"13:00");
+        if (!scheduleId1.isEmpty()) {
+            scheduleId1.stream().forEach(scheduleId0 -> {
+                //编辑成功后check同规则中下周一课次详情
+                groupScheduleTools.getScheduleItemDetail(scheduleId0);
+                String detailResult1 = dataApi.getApi_response();
+                Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.chiefCoachId"), chiefCoachIdS);
+                Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.minMemberNum"), "2");
+                Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.maxMemberNum"), "999");
+                Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.startTime"), startStamp3);
+                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.assistCoachIds").containsAll(assistCoachIdS), "助教无修改，但是却变动了");
+                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.venueAreaIds").containsAll(venueAreaIds), "场地无修改，但是却变动了");
+
+
+            });
+        }
+
+
+
+
+    }
+
+    /**
+     *
+     * @param n 整数
+     * @param time 整点时间 比如13：00
+     * @return
+     */
+    public String getWholeHourTimeStamp(int n,String time){
+        Date getWeekStartDayData = CommUtil.getStartOfDateWeek(now);
+        Date getNextWeekXDayData = CommUtil.addNDays(getWeekStartDayData, n);
+        String getNextWeekXDayDataS = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData.getTime());
+        return CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS + " " + time);
 
 
     }
     }