Merge pull request #101 from kube-js/develop

fix: added get discovery items route

Author: mariocoski

k8s/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Helm chart for kube-ts-server
 name: kube-ts-server
 version: 1.0.0
-appVersion: 1.4.32
+appVersion: 1.4.37
 home: https://cloud.docker.com/u/kubejs/repository/docker/kubejs/kube-ts-server
 icon: https://avatars2.githubusercontent.com/u/47761918?s=200&v=4
 sources:

k8s/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 2
 
 image:
   repository: kubejs/kube-ts-server
-  tag: 1.4.32
+  tag: 1.4.37
   pullPolicy: Always
   containerPort: 3000
 

src/constants/routes.ts

@@ -25,3 +25,4 @@ export const ENROLMENTS = '/enrolments';
 export const MODULES = '/modules';
 export const UNITS = '/units';
 export const COMMENTS = '/comments';
+export const DISCOVERY_ITEMS = '/discovery-items';

src/presenter/express/api/v1/index.ts

@@ -3,6 +3,7 @@ import {
   AUTH,
   CATEGORIES,
   COURSES,
+  DISCOVERY_ITEMS,
   ENROLMENTS,
   // MODULES,
   // UNITS
@@ -16,6 +17,7 @@ import authFactory from './routes/auth/factory';
 import categoriesFactory from './routes/categories/factory';
 import coursesFactory from './routes/courses/factory';
 import enrolmentsFactory from './routes/enrolments/factory';
+import getDiscoveryItems from './routes/getDiscoveryItems';
 import permissionsFactory from './routes/permissions/factory';
 import rolesFactory from './routes/roles/factory';
 import usersFactory from './routes/users/factory';
@@ -38,6 +40,7 @@ const apiV1 = (config: Config): Router => {
   router.use(CATEGORIES, categoriesFactory(config));
   router.use(COURSES, coursesFactory(config));
   router.use(ENROLMENTS, enrolmentsFactory(config));
+  router.use(DISCOVERY_ITEMS, getDiscoveryItems(config));
   // router.use(MODULES, modulesFactory(config));
   // router.use(UNITS, unitsFactory(config));
   // TODO: add route for uploading /avatar

src/presenter/express/api/v1/routes/getDiscoveryItems/index.ts

@@ -0,0 +1,27 @@
+import sendResponse from '@js-items/express/dist/utils/sendResponse';
+import { toSnake } from 'convert-keys';
+import { OK } from 'http-status-codes';
+import Config from '../../../../presenterFactory/Config';
+import catchErrors from '../../../../utils/errors/catchErrors';
+
+const getDiscoveryItems = (config: Config) =>
+  catchErrors(config, async (req, res) => {
+    const type = req.query.type;
+    
+    let response;
+    
+    switch (type) {
+      case 'homepage':
+      default:
+        response = await config.service.getDiscoveryItemsForHomepage({});
+    }
+
+    sendResponse({
+      body: toSnake(response),
+      req,
+      res,
+      status: OK,
+    });
+  });
+
+export default getDiscoveryItems;

src/presenter/express/api/v1/routes/utils/describeApi/__snapshots__/index.spec.ts.snap

@@ -18,6 +18,7 @@ Object {
       "version": "/version",
     },
     "courses": "/api/v1/courses",
+    "discovery_items": "/api/v1/discovery-items",
     "enrolments": "/api/v1/enrolments",
     "permissions": "/api/v1/permissions",
     "roles": "/api/v1/roles",

src/presenter/express/api/v1/routes/utils/describeApi/index.ts

@@ -25,6 +25,7 @@ const describeApi = (config: Config) =>
           version,
         },
         courses: '/api/v1/courses',
+        discoveryItems: '/api/v1/discovery-items',
         enrolments: '/api/v1/enrolments',
         permissions: '/api/v1/permissions',
         roles: '/api/v1/roles',

src/service/factory.ts

@@ -1,6 +1,7 @@
 import migrationsServiceFactory from '@js-migrations/core/dist/factory';
 import FactoryConfig from './FactoryConfig';
 import authFactory from './functions/auth/factory';
+import getDiscoveryItemsForHomepage from './functions/getDiscoveryItemsForHomepage';
 import hasPermission from './functions/hasPermission';
 import assignRolePermission from './functions/roles/assignRolePermission';
 import revokeRolePermission from './functions/roles/revokeRolePermission';
@@ -15,6 +16,7 @@ export default (config: FactoryConfig) => ({
   closeDbConnection: config.repo.closeDbConnection,
   courses: config.repo.courses,
   enrolments: config.repo.enrolments,
+  getDiscoveryItemsForHomepage: getDiscoveryItemsForHomepage(config),
   hasPermission: hasPermission(config),
   migrations: migrationsServiceFactory({
     repo: config.repo.migrations,

src/service/functions/getDiscoveryItemsForHomepage/index.ts

@@ -0,0 +1,44 @@
+import _pluck from 'ramda/src/pluck';
+import Course from '../../../types/items/Course';
+import Config from '../../FactoryConfig';
+
+// tslint:disable-next-line:no-empty-interface
+export interface Options {}
+
+// tslint:disable-next-line:arrow-return-shorthand
+export default ({ repo }: Config) => async (_options: Options) => {
+  const { items: categories } = await repo.categories.getItems({
+    pagination: {
+      limit: 10000,
+    },
+  });
+
+  const { items: courses } = await repo.courses.getItems({
+    pagination: {
+      limit: 10000,
+    },
+  });
+
+  const { items: users } = await repo.users.getItems({
+    pagination: {
+      limit: 10000,
+    },
+  });
+
+  const enhancedCourses = courses.map((course: Course) => ({
+    ...course,
+    user: users.filter(user => user.id === course.userId),
+  }));
+
+  return {
+    bestSellers: {
+      // TODO: in the future basing on number of enrolments choose the most popular one
+      categories,
+      courses: enhancedCourses,
+    },
+    mostViewed: {
+      // TODO: in the future choose the most viewed ones
+      courses: enhancedCourses,
+    },
+  };
+};