Modified server api. Dates are stored in calendar events, REST methods no more provided for them. Occurencies can still be count by /occurencies/... GET method

Author: almerk

README.md

@@ -55,17 +55,17 @@ Server app provides fake api to these listed entities:
 | ------------- | ------------- | ------------------------------------------ | --------------- |
 | #calendarTypes | /calendarTypes/:id? | [id](#objects),<br/><hr/> name | 
 | #calendars<sup>extensible</sup> | /calendars/:id? | [id](#objects), <br/><hr/> [typeId](#calendarTypes), <br/> name,<br>**...** | _typeId determines calendar type._, _This entity can be extended._|
-| #calendarEvents<sup>extensible</sup> | /calendarEvents/:id? | [id](#objects),<hr/>[calendarId](#calendars),<br/>name, <br/> description, **...** | _this entity can be extended._ _The [calendar type](#calendarTypes) determines the type of event._ |
+| #calendarEvents<sup>extensible</sup> | /calendarEvents/:id? | [id](#objects),<hr/>[calendarId](#calendars),<br/>name,<br/>[dates](#dates)<br/> description, **...** | _this entity can be extended._ _The [calendar type](#calendarTypes) determines the type of event._ |
 
 ### Calendario event date domain
 | Entity | Urls | Fields | Comments |
 | ------------- | ------------- | ------------------------------------------ | --------------- |
-| #dates<sup>extensible</sup>| /dates |[eventId](#eventId),<br/> $type,<br/>isExcept,<br/> **...** | |
+| #dates<sup>extensible</sup>| No url provided. These VO are included in calendarEvent entity |[eventId](#eventId),<br/> $type,<br/>isExcept,<br/> **...** | |
 | #dates$type=simpleDate | - | dateTime,<br/> hasTime <br/> | |
 | #dates$type=continuousDate| - | start, end,<br/>hasTime| |
 | #dates$type=reccurenceDate| - | hasTime,<br/>rrule | |
 | #dates$type=continuousReccurenceDate | - | start, end,<br/>hasTime,<br/> rrule | |
-| occurence | /dates/from/:start/till/:end | [eventId](#eventId),<br/> dateTime.value,<br/> dateTime.hasTime <br/> dateTime.belonging<sup>[nullable]</sup>, status<sup>[nullable]</sup> | |
+| occurence | /dates/from/:start/till/:end | [eventId](#eventId),<br/> dateTime.value,<br/> dateTime.hasTime <br/> dateTime.belonging<sup>[nullable]</sup>, status<sup>[nullable]</sup> | _Event occurencies are calculated from dates_|
 
 These entities are randomly generated when server app starts.
 

server/controllers/dates.js

@@ -0,0 +1,13 @@
+const getCollection = (req) => req.app.locals['objects'];
+const computeOccurencies = require('../logic/occurencies.js');
+
+const occurencies = async (req, res, next, start, end) => {
+ const objectsCollection = getCollection(req);
+ const values = await objectsCollection.find({ type: /\w*Event/i }).project({ id: true, dates: true, _id: false }).toArray();
+ const occurencies = values.map(x => computeOccurencies(x.dates, start, end)).reduce((a, b) => a.concat(b), []);
+ res.json(occurencies);
+}
+
+module.exports = {
+ occurencies
+}

server/controllers/occurencies.js

@@ -13,12 +13,10 @@ module.exports = async (db) => {
  db.collection("subjects").insertMany(entities.subjects, insertFunc ); 
  db.collection("objects").insertMany(entities.objects, insertFunc); 
  db.collection("relations").insertMany(entities.relations, insertFunc); 
- db.collection("dates").insertMany(entities.dates, insertFunc);
 
  return {
  subjects: db.collection("subjects"),
  objects: db.collection("objects"),
  relations: db.collection('relations'),
- dates: db.collection('dates')
  }
 }

server/db/configurate.js

@@ -103,7 +103,8 @@ for (let i = 0; i < EVENTS_COUNT; i++) {
  id: getObjectId(),
  calendarId: calendars[Math.floor(Math.random() * calendars.length)].id,
  name: getRandomName(),
- description: i % 3 == 0 ? '' : getRandomName()
+ description: i % 3 == 0 ? '' : getRandomName(),
+ dates: []
  })
  );
 }
@@ -176,12 +177,11 @@ objects.forEach(object => {
  3. Notification events can have all type of dates and can have no date. All these events must be displayed to user
  4. Occurence is a composed value. It is composed from date
 */
-const dates = []
 const freq = [RRule.YEARLY, RRule.MONTHLY, RRule.WEEKLY, RRule.DAILY, RRule.HOURLY]
 const getRandomRRule = (hasTime, start) =>
  new RRule({
  freq: freq[rand(0, freq.length - 1)],
- dtstart:  start || (rand(0, 5) != 5 ? getRandomDate(hasTime) : undefined),
+ dtstart: start || (rand(0, 5) != 5 ? getRandomDate(hasTime) : undefined),
  interval: rand(1, 3),
  until: rand(0, 5) == 5 ? getRandomDate(hasTime) : undefined
  }).toString();
@@ -197,7 +197,7 @@ calendarEvents.forEach(event => {
  bymonthday: rand(1, 28),
  bymonth: rand(1, 12)
  });
- dates.push({
+ event.dates.push({
  eventId: event.id,
  type: "reccurenceDate",
  hasTime: false,
@@ -249,7 +249,7 @@ calendarEvents.forEach(event => {
  date.end = dateAndTime.addMinutes(date.start, rand(30, 20160))
  break;
  }
- dates.push(date);
+ event.dates.push(date);
  }
  break;
  case 'taskEvent':
@@ -283,7 +283,7 @@ calendarEvents.forEach(event => {
  rrule: getRandomRRule(date.hasTime)
  }
  if (rand(0, 2) > 0) {
- dates.push({
+ event.dates.push({
  eventId: event.id,
  hasTime: rand(0, 1) > 0,
  type: 'simpleDate',
@@ -302,7 +302,7 @@ calendarEvents.forEach(event => {
  rrule: getRandomRRule(date.hasTime, start)
  }
  if (rand(0, 2) > 0) {
- dates.push({
+ event.dates.push({
  eventId: event.id,
  isExcept: true,
  hasTime: rand(0, 1) > 0,
@@ -315,13 +315,12 @@ calendarEvents.forEach(event => {
  date.end = dateAndTime.addMinutes(date.start, rand(30, 20160))
  break;
  }
- dates.push(date);
+ event.dates.push(date);
  }
  break;
  }
 
 });
-
 module.exports = {
  groups,
  users,
@@ -330,6 +329,5 @@ module.exports = {
  calendars,
  calendarEvents,
  objects,
- relations,
- dates
+ relations
 }

server/db/random-entities.js

@@ -14,7 +14,7 @@ function computeOccurencies(dateArray, start, finish) {
  isExcept: v.isExcept
  }))
  })
- .reduce((a, b) => a.concat(b))
+ .reduce((a, b) => a.concat(b),[])
  .filter(x => x.dateTime.value >= start && x.dateTime.value <= finish)
  .reduce((gr, d) => {
  (gr[d.eventId] = gr[d.eventId] || []).push(d);
@@ -30,7 +30,7 @@ function computeOccurencies(dateArray, start, finish) {
  }
  });
  const result = Object.values(groupedByEventId)
- .reduce((a, b) => a.concat(b))
+ .reduce((a, b) => a.concat(b), [])
  .sort((a, b) => a.dateTime.value - b.dateTime.value);
  result.forEach(x => { delete x.isExcept });
  return result;

server/logic/occurencies.js

@@ -4,7 +4,7 @@ const alias = require('./routes/alias.js')
 const subjects = require("./routes/subjects");
 const objects = require("./routes/objects");
 const relations = require("./routes/relations");
-const dates = require("./routes/dates");
+const occurencies = require("./routes/occurencies");
 const date = require('date-and-time')
 
 router.use(function (req, res, next) {
@@ -18,7 +18,7 @@ router.use('/', alias)
 router.use('/subjects', subjects)
 router.use('/objects', objects)
 router.use('/relations', relations)
-router.use('/dates', dates)
+router.use('/occurencies', occurencies)
 router.use('*', (req, res) => {
  console.log('\tRoute not found!')
  res.status(404).sendFile(__dirname + '/404.html')}

server/routes.js

@@ -1,21 +1,13 @@
 const express = require('express');
-const controller = require('../controllers/dates.js');
+const controller = require('../controllers/occurencies.js');
 const router = express.Router();
 
 const parse = (str) => require('date-and-time').parse(str,'YYYY-MM-DD')
 
-/**
- * Get all calendario event dates
- * @route GET /dates
- * @param {string} type.query filter result by type
- * @returns {Array} 200 - Dates array 
- */
- router.get('/', controller.all)
-
  /**
  * Get all calendario event date occurencies between two dates (inclusively)
- * @route GET /dates/from/{start}/till/{end}
- * @param {string} start.param.requied start date (YYYY-MM-DD) - eg: 2020-12-01
+ * @route GET /occurencies/from/{start}/till/{end}
+ * @param {string} start.param.required start date (YYYY-MM-DD) - eg: 2020-12-01
  * @param {string} end.param.required finish date (YYYY-MM-DD) - eg: 2021-01-05
  * @returns {Array} 200 - Occurencies array 
  */