Merge pull request #238 from CircleCI-Public/CIRCLE-15460-orb-list-js…

…on-stats Show statistics in `orb list --json`
CircleCI-Public · Dec 25, 2018 · 94e0863 · 94e0863
2 parents f354ca5 + 365ac9e
commit 94e0863
Show file tree

Hide file tree

Showing 5 changed files with 209 additions and 59 deletions.
diff --git a/api/api.go b/api/api.go
@@ -237,7 +237,12 @@ func (orbs *OrbsForListing) SortBy(sortBy string) {
 type OrbBase struct {
 	Name           string `json:"name"`
 	HighestVersion string `json:"version"`
-	Versions       []struct {
+	Statistics     struct {
+		Last30DaysBuildCount        int `json:"last30DaysBuildCount"`
+		Last30DaysProjectCount      int `json:"last30DaysProjectCount"`
+		Last30DaysOrganizationCount int `json:"last30DaysOrganizationCount"`
+	} `json:"statistics"`
+	Versions []struct {
 		Version string `json:"version"`
 		Source  string `json:"source"`
 	} `json:"versions"`
@@ -247,12 +252,6 @@ type OrbBase struct {
 type OrbWithData struct {
 	OrbBase
 
-	Statistics struct {
-		Last30DaysBuildCount        int
-		Last30DaysProjectCount      int
-		Last30DaysOrganizationCount int
-	}
-
 	Commands  map[string]OrbElement
 	Jobs      map[string]OrbElement
 	Executors map[string]OrbElement
@@ -264,6 +263,7 @@ func (orb OrbWithData) MarshalJSON() ([]byte, error) {
 	orbForJSON := OrbBase{
 		orb.Name,
 		orb.HighestVersion,
+		orb.Statistics,
 		orb.Versions,
 	}
 

diff --git a/cmd/testdata/gql_orb_list/pretty_json_output.json b/cmd/testdata/gql_orb_list/pretty_json_output.json
@@ -2,6 +2,11 @@
   "orbs": [
     {
       "name": "circleci/codecov-clojure",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.3",
       "versions": [
         {
@@ -12,6 +17,11 @@
     },
     {
       "name": "circleci/gradle",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.1",
       "versions": [
         {
@@ -22,6 +32,11 @@
     },
     {
       "name": "eric-hu/delivery-test",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "1.0.4",
       "versions": [
         {
@@ -32,6 +47,11 @@
     },
     {
       "name": "ndintenfass/build-utils",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.2",
       "versions": [
         {
@@ -42,6 +62,11 @@
     },
     {
       "name": "test1/foo",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.0",
       "versions": [
         {
@@ -52,6 +77,11 @@
     },
     {
       "name": "test1/new-orb",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.1",
       "versions": [
         {
@@ -62,6 +92,11 @@
     },
     {
       "name": "test1/so-fly",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.0",
       "versions": [
         {
@@ -72,6 +107,11 @@
     },
     {
       "name": "test/test",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.3",
       "versions": [
         {

diff --git a/cmd/testdata/gql_orb_list_details/pretty_json_output.json b/cmd/testdata/gql_orb_list_details/pretty_json_output.json
@@ -1,14 +1,19 @@
 {
-	"orbs": [
-		{
-			"name": "foo/test",
-			"version": "0.7.0",
-			"versions": [
-				{
-					"version": "0.7.0",
-					"source": "version: 2.1\norbs:\n  foo:\n    commands:\n      foo:\n        steps:\n          - checkout\ncommands:\n  myfoo: foo/foo\n  bar:\n    parameters:\n      hello:\n        type: string\n        default: world\n    steps:\n      - echo \u003c\u003cparameters.hello\u003e\u003e\n\nexecutors:\n  default:\n    parameters:\n      tag:\n        type: string\n        default: \"curl-browsers\"\n    docker:\n      - image: circleci/buildpack-deps:\u003c\u003c parameters.tag \u003e\u003e\n\njobs:\n  hello-build:\n    executor: default\n    steps:\n      - echo:\n          message: \"Hello, build!\"\n"
-				}
-			]
-		}
-	]
+  "orbs": [
+    {
+      "name": "foo/test",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
+      "version": "0.7.0",
+      "versions": [
+	{
+	  "version": "0.7.0",
+	  "source": "version: 2.1\norbs:\n  foo:\n    commands:\n      foo:\n        steps:\n          - checkout\ncommands:\n  myfoo: foo/foo\n  bar:\n    parameters:\n      hello:\n        type: string\n        default: world\n    steps:\n      - echo \u003c\u003cparameters.hello\u003e\u003e\n\nexecutors:\n  default:\n    parameters:\n      tag:\n        type: string\n        default: \"curl-browsers\"\n    docker:\n      - image: circleci/buildpack-deps:\u003c\u003c parameters.tag \u003e\u003e\n\njobs:\n  hello-build:\n    executor: default\n    steps:\n      - echo:\n          message: \"Hello, build!\"\n"
+	}
+      ]
+    }
+  ]
 }
diff --git a/cmd/testdata/gql_orb_list_uncertified/pretty_json_output.json b/cmd/testdata/gql_orb_list_uncertified/pretty_json_output.json
@@ -2,6 +2,11 @@
   "orbs": [
     {
       "name": "circleci/codecov-clojure",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.4",
       "versions": [
         {
@@ -12,6 +17,11 @@
     },
     {
       "name": "circleci/gradle",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.1",
       "versions": [
         {
@@ -22,6 +32,11 @@
     },
     {
       "name": "circleci/rollbar",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.1",
       "versions": [
         {
@@ -32,6 +47,11 @@
     },
     {
       "name": "eric-hu/delivery-test",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "1.0.4",
       "versions": [
         {
@@ -42,6 +62,11 @@
     },
     {
       "name": "hannah/foo",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.0",
       "versions": [
         {
@@ -52,6 +77,11 @@
     },
     {
       "name": "hannah/new-orb",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.1",
       "versions": [
         {
@@ -62,6 +92,11 @@
     },
     {
       "name": "hannah/so-fly",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.0",
       "versions": [
         {
@@ -72,6 +107,11 @@
     },
     {
       "name": "ndintenfass/build-utils",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.2",
       "versions": [
         {
@@ -82,6 +122,11 @@
     },
     {
       "name": "test/test",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.0.3",
       "versions": [
         {
@@ -92,6 +137,11 @@
     },
     {
       "name": "zzak/test4",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.1.0",
       "versions": [
         {
@@ -102,6 +152,11 @@
     },
     {
       "name": "zzak/testing",
+      "statistics": {
+        "last30DaysBuildCount": 0,
+        "last30DaysProjectCount": 0,
+        "last30DaysOrganizationCount": 0
+      },
       "version": "0.2.0",
       "versions": [
         {