Merge pull request #116 from kube-js/develop

fix: added course sections

Author: mariocoski

README.md

@@ -72,7 +72,7 @@ npm run test:watch
 - resetPasswordTokens
 - courses
 - enrolments
-- modules
+- sections
 - units
 
 ## This repo would not exist if not inspiration coming from:

assets/jscpd-badge.svg

@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Helm chart for kube-ts-server
 name: kube-ts-server
 version: 1.0.0
-appVersion: 1.5.6
+appVersion: 1.5.17
 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/Chart.yaml

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

k8s/values.yaml

@@ -22,7 +22,7 @@ export const PERMISSIONS = '/permissions';
 export const COURSES = '/courses';
 export const CATEGORIES = '/categories';
 export const ENROLMENTS = '/enrolments';
-export const MODULES = '/modules';
+export const SECTIONS = '/sections';
 export const UNITS = '/units';
 export const COMMENTS = '/comments';
 export const DISCOVERY_ITEMS = '/discovery-items';

src/constants/routes.ts

@@ -0,0 +1,32 @@
+import { v4 as uuid } from 'uuid';
+
+const sections = [
+  {
+    id: uuid(),
+    order: 1,
+    title: 'First section',
+  },
+  {
+    id: uuid(),
+    order: 2,
+    title: 'Second section'
+  },
+  {
+    id: uuid(),
+    order: 3,
+    title: 'Third section'
+  },
+  {
+    id: uuid(),
+    order: 4,
+    title: 'Fourth section'
+  },
+  {
+    id: uuid(),
+    order: 5,
+    title: 'Fifth section'
+  },
+
+];
+
+export default sections;

src/presenter/commander/data/sections.ts

@@ -86,10 +86,13 @@ const createCategoriesAndCourses = (config: FactoryConfig) => async ({
     return [...acc, ...coursesPromisesArray];
   }, []);
 
-  await Promise.all(coursesPromises);
+  const items = await Promise.all(coursesPromises);
 
+  
   console.log(`Courses created successfuly!`);
   console.log(`--------------------------------------------------------`);
+  
+  return items.map(({ item }) => item.id);
 };
 
 export default createCategoriesAndCourses;

src/presenter/commander/functions/dbSeed/functions/createCategoriesAndCourses/index.ts

@@ -0,0 +1,53 @@
+// tslint:disable:no-magic-numbers
+// tslint:disable:no-console
+import _pluck from 'ramda/src/pluck';
+import { v4 as uuid } from 'uuid';
+import getUtcDate from '../../../../../../utils/helpers/date/getUtcDate';
+import FactoryConfig from '../../../../presenterFactory/FactoryConfig';
+
+export interface SectionPartial {
+  readonly title: string;
+  readonly id: string;
+  readonly order: number;
+}
+
+export interface Options {
+  readonly coursesIds: string[];
+  readonly sections: SectionPartial[];
+}
+
+const createSectionsAndUnits = (config: FactoryConfig) => async ({
+  coursesIds,
+  sections,
+}: Options) => {
+  console.log(`--------------------------------------------------------`);
+  console.log(
+    `Creating sections `
+  );
+  const sectionsPromises = coursesIds.reduce((acc: Promise<any>[], courseId) => {
+    const sectionsPromisesArray = sections.map(async section => {
+      const sectionId = uuid();
+
+      return config.service.sections.createItem({
+        id: sectionId,
+        item: {
+          courseId,
+          createdAt: getUtcDate(),
+          id: sectionId,
+          order: section.order,
+          title: section.title,
+        },
+      });
+    });
+
+    return [...acc, ...sectionsPromisesArray];
+  }, []);
+
+  await Promise.all(sectionsPromises);
+
+  
+  console.log(`Sections created successfuly!`);
+  console.log(`--------------------------------------------------------`);
+};
+
+export default createSectionsAndUnits;

src/presenter/commander/functions/dbSeed/functions/createSectionsAndUnits/index.ts

@@ -6,6 +6,7 @@ import {
 } from '../../../../constants/permissions';
 import { ADMIN, INSTRUCTOR, STUDENT } from '../../../../constants/roles';
 import categories from '../../data/categories';
+import sections from '../../data/sections';
 import {
   adminOptions,
   firstInstructorOptions,
@@ -19,6 +20,7 @@ import connectPermissionsToRoles from './functions/connectPermissionsToRoles';
 import createCategoriesAndCourses from './functions/createCategoriesAndCourses';
 import createPermissions from './functions/createPermissions';
 import createRoles from './functions/createRoles';
+import createSectionsAndUnits from './functions/createSectionsAndUnits';
 import createUser from './functions/createUser';
 
 export const processExitTimeout = 10000;
@@ -97,11 +99,16 @@ const dbSeed = (config: FactoryConfig) => async () => {
       rolesIds: [studentRoleId],
     });
 
-    await createCategoriesAndCourses(config)({
+    const coursesIds = await createCategoriesAndCourses(config)({
       categories,
       instructorsIds: [firstInstructorId, secondInstructorId],
     });
 
+    await createSectionsAndUnits(config)({
+      coursesIds,
+      sections,
+    });
+
     config.logger.info('Seeding successful');
 
     // FYI: allow logger to send all the logs

src/presenter/commander/functions/dbSeed/index.ts

@@ -6,11 +6,11 @@ import {
   COURSES,
   DISCOVERY_ITEMS,
   ENROLMENTS,
-  // MODULES,
   // UNITS
   PERMISSIONS,
   ROLES,
   ROOT,
+  SECTIONS,
   USERS,
 } from '../../../../constants/routes';
 import Config from '../../presenterFactory/Config';
@@ -22,6 +22,7 @@ import enrolmentsFactory from './routes/enrolments/factory';
 import getDiscoveryItems from './routes/getDiscoveryItems';
 import permissionsFactory from './routes/permissions/factory';
 import rolesFactory from './routes/roles/factory';
+import sectionsFactory from './routes/sections/factory';
 import usersFactory from './routes/users/factory';
 import describeApi from './routes/utils/describeApi';
 
@@ -44,14 +45,15 @@ const apiV1 = (config: Config): Router => {
   router.use(ENROLMENTS, enrolmentsFactory(config));
   router.use(DISCOVERY_ITEMS, getDiscoveryItems(config));
   router.get(AUTOCOMPLETE, autocompleteHandler(config));
-  // router.use(MODULES, modulesFactory(config));
+  router.use(SECTIONS, sectionsFactory(config));
   // router.use(UNITS, unitsFactory(config));
   // TODO: add route for uploading /avatar
   // TODO: add route for uploads
   // TODO: research uploading to s3: https://github.com/SanderKnape/aws-upload-to-s3
   // https://sanderknape.com/2017/08/using-pre-signed-urls-upload-file-private-s3-bucket/
   // https://stackoverflow.com/questions/40304512/get-or-put-objects-on-amazon-s3-with-pre-signed-url
   // https://www.quora.com/How-do-I-link-a-file-from-S3-to-DynamoDB
+  // https://stackoverflow.com/questions/54119399/expose-port-80-on-digital-oceans-managed-kubernetes-without-a-load-balancer/55968709#55968709
 
   router.get(ROOT, describeApi(config));