Added groupMode to API for pull history

This commit is contained in:
Josh Stark 2019-04-26 10:14:11 +01:00
parent c45602840b
commit cfecf3f9ad
2 changed files with 23 additions and 2 deletions

View File

@ -56,5 +56,21 @@ public class ImagePullStat {
public String toString() {
return name().toLowerCase();
}
public static boolean isValid(String value) {
try {
if (null == value) {
return false;
}
valueOf(value);
return true;
} catch (IllegalArgumentException e) {
return false;
}
}
}
}

View File

@ -46,10 +46,15 @@ public class GetImagePullHistoryApi implements Route {
}
int imageId = Integer.parseInt(imageIdParam);
List<ImagePullStat> imagePullStats = imageDelegate.fetchImagePullHistory(imageId, getGroupMode(request));
Image image = imageDelegate.fetchImage(imageId);
List<ImagePullStat> imagePullStats = imageDelegate.fetchImagePullHistory(imageId);
return new ApiResponse<>("OK", ApiImagePullHistory.fromPullStats(image, imagePullStats));
}
private ImagePullStat.GroupMode getGroupMode(Request request) {
String groupMode = request.params("groupMode");
return ImagePullStat.GroupMode.isValid(groupMode) ? ImagePullStat.GroupMode.valueOf(groupMode) : ImagePullStat.GroupMode.DAY;
}
}