Reorganize categories code

Seems that the list of categories belongs with the services, while the
support code belongs with base service.

Ref #2832

core/base-service/base.js

@@ -4,7 +4,7 @@
 const emojic = require('emojic')
 const Joi = require('joi')
 const { checkErrorResponse } = require('../../lib/error-helper')
-const { assertValidCategory } = require('../../services/categories')
+const { assertValidCategory } = require('./categories')
 const coalesceBadge = require('./coalesce-badge')
 const {
   NotFound,

core/base-service/categories.js

@@ -0,0 +1,18 @@
+'use strict'
+
+const Joi = require('joi')
+const categories = require('../../services/categories')
+
+const isRealCategory = Joi.equal(categories.map(({ id }) => id)).required()
+
+const isValidCategory = Joi.alternatives()
+  .try(isRealCategory, Joi.equal('debug', 'dynamic').required())
+  .required()
+
+function assertValidCategory(category, message = undefined) {
+  Joi.assert(category, isValidCategory, message)
+}
+
+module.exports = {
+  assertValidCategory,
+}

core/base-service/loader.js

@@ -2,7 +2,7 @@
 
 const path = require('path')
 const glob = require('glob')
-const { categories } = require('../../services/categories')
+const categories = require('../../services/categories')
 const BaseService = require('./base')
 const { assertValidServiceDefinitionExport } = require('./service-definitions')
 

services/categories.js

@@ -1,8 +1,6 @@
 'use strict'
 
-const Joi = require('joi')
-
-const categories = [
+module.exports = [
   { id: 'build', name: 'Build' },
   { id: 'coverage', name: 'Code Coverage' },
   { id: 'analysis', name: 'Analysis' },
@@ -21,18 +19,3 @@ const categories = [
   { id: 'activity', name: 'Activity' },
   { id: 'other', name: 'Other' },
 ]
-
-const isRealCategory = Joi.equal(categories.map(({ id }) => id)).required()
-
-const isValidCategory = Joi.alternatives()
-  .try(isRealCategory, Joi.equal('debug', 'dynamic').required())
-  .required()
-
-function assertValidCategory(category, message = undefined) {
-  Joi.assert(category, isValidCategory, message)
-}
-
-module.exports = {
-  categories,
-  assertValidCategory,
-}