Add created in schedule response & change order to desc

vishesh92 · vishesh92 · commit c2ba181dd008 · 2023-06-23T02:18:07.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java
@@ -65,6 +65,10 @@ public class VMScheduleResponse extends BaseResponse {
     @Param(description = "Date after which the schedule becomes inactive")
     private Date endDate;
 
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "Date when the schedule was created")
+    private Date created;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -100,4 +104,6 @@ public void setStartDate(Date startDate) {
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
+
+    public void setCreated(Date created) {this.created = created;}
 }
diff --git a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedule.java b/api/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedule.java
@@ -46,4 +46,6 @@ enum Action {
     Date getEndDate();
 
     ZoneId getTimeZoneId();
+
+    Date getCreated();
 }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java
@@ -176,4 +176,8 @@ public void setEndDate(Date endDate) {
     public ZoneId getTimeZoneId() {
         return TimeZone.getTimeZone(getTimeZone()).toZoneId();
     }
+
+    public Date getCreated() {
+        return created;
+    }
 }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDaoImpl.java
@@ -95,7 +95,7 @@ public Pair<List<VMScheduleVO>, Integer> searchAndCount(Long id, Long vmId, VMSc
         }
         sc.setParameters(ApiConstants.VIRTUAL_MACHINE_ID, vmId);
 
-        Filter filter = new Filter(VMScheduleVO.class, ApiConstants.ID, true, offset, limit);
+        Filter filter = new Filter(VMScheduleVO.class, ApiConstants.ID, false, offset, limit);
         return searchAndCount(sc, filter);
     }
 
diff --git a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
@@ -149,6 +149,7 @@ public VMScheduleResponse createResponse(VMSchedule vmSchedule) {
         response.setEnabled(vmSchedule.getEnabled());
         response.setStartDate(vmSchedule.getStartDate());
         response.setEndDate(vmSchedule.getEndDate());
+        response.setCreated(vmSchedule.getCreated());
         return response;
     }
 
diff --git a/ui/src/views/compute/InstanceSchedules.vue b/ui/src/views/compute/InstanceSchedules.vue
@@ -215,7 +215,7 @@ export default {
     this.fetchTimeZone = debounce(this.fetchTimeZone, 800)
     return {
       tabLoading: false,
-      columnKeys: ['action', 'enabled', 'description', 'schedule', 'timezone', 'startdate', 'enddate', 'vmScheduleActions'],
+      columnKeys: ['action', 'enabled', 'description', 'schedule', 'timezone', 'startdate', 'enddate', 'created', 'vmScheduleActions'],
       selectedColumnKeys: [],
       columns: [],
       schedules: [],

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ public class VMScheduleResponse extends BaseResponse {`
`65`	`65`	`@Param(description = "Date after which the schedule becomes inactive")`
`66`	`66`	`private Date endDate;`
`67`	`67`
	`68`	`+ @SerializedName(ApiConstants.CREATED)`
	`69`	`+ @Param(description = "Date when the schedule was created")`
	`70`	`+ private Date created;`
	`71`	`+`
`68`	`72`	`public void setId(String id) {`
`69`	`73`	`this.id = id;`
`70`	`74`	`}`
`@@ -100,4 +104,6 @@ public void setStartDate(Date startDate) {`
`100`	`104`	`public void setEndDate(Date endDate) {`
`101`	`105`	`this.endDate = endDate;`
`102`	`106`	`}`
	`107`	`+`
	`108`	`+ public void setCreated(Date created) {this.created = created;}`
`103`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,6 @@ enum Action {`
`46`	`46`	`Date getEndDate();`
`47`	`47`
`48`	`48`	`ZoneId getTimeZoneId();`
	`49`	`+`
	`50`	`+ Date getCreated();`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,4 +176,8 @@ public void setEndDate(Date endDate) {`
`176`	`176`	`public ZoneId getTimeZoneId() {`
`177`	`177`	`return TimeZone.getTimeZone(getTimeZone()).toZoneId();`
`178`	`178`	`}`
	`179`	`+`
	`180`	`+ public Date getCreated() {`
	`181`	`+ return created;`
	`182`	`+ }`
`179`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public Pair<List<VMScheduleVO>, Integer> searchAndCount(Long id, Long vmId, VMSc`
`95`	`95`	`}`
`96`	`96`	`sc.setParameters(ApiConstants.VIRTUAL_MACHINE_ID, vmId);`
`97`	`97`
`98`		`- Filter filter = new Filter(VMScheduleVO.class, ApiConstants.ID, true, offset, limit);`
	`98`	`+ Filter filter = new Filter(VMScheduleVO.class, ApiConstants.ID, false, offset, limit);`
`99`	`99`	`return searchAndCount(sc, filter);`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public VMScheduleResponse createResponse(VMSchedule vmSchedule) {`
`149`	`149`	`response.setEnabled(vmSchedule.getEnabled());`
`150`	`150`	`response.setStartDate(vmSchedule.getStartDate());`
`151`	`151`	`response.setEndDate(vmSchedule.getEndDate());`
	`152`	`+ response.setCreated(vmSchedule.getCreated());`
`152`	`153`	`return response;`
`153`	`154`	`}`
`154`	`155`