Story map admin

.env.test.defaults

@@ -30,6 +30,7 @@ JWT_SECRET=ultra
 
 SMAPSHOT_API_URL=http://localhost:1337
 SMAPSHOT_API_PROD_URL=http://localhost:1337/api
+SMAPCOMPUTE_URL=http://localhost:5000
 
 RECAPTCHA_SITEKEY=foo
 RECAPTCHA_SECRETKEY=foo
@@ -39,3 +40,5 @@ AUTH_FACEBOOK_APP_ID=foo
 AUTH_FACEBOOK_APP_SECRET=foo
 
 TZ=Europe/Zurich
+
+SMAPCOMPUTE_URL=http://localhost:5000/generate

app/api/chapters/chapter.openapi.yml

@@ -1,46 +1,40 @@
-/chapters:
-  get:
-    summary: Retrieve all chapters
-    parameters:
-      - name: page
-        in: query
-        required: false
-        schema:
-          type: integer
-          minimum: 1
-    responses:
-      '200':
-        description: OK
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/ChaptersList"
-
+/stories/{storyId}/chapters:
   post:
     summary: Add a chapter to the db.
     operationId: addChapter
+    parameters:
+      - name: storyId
+        in: path
+        required: true
+        schema:
+          type: string
     requestBody:
       required: true
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/Chapters"
+            $ref: "#/components/schemas/ChaptersRequest"
     responses:
-      '200':
+      '201':
         description: OK
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/Chapters"
-
-      '404':
-        $ref: "#/components/responses/NotFoundError"
+              $ref: "#/components/schemas/ChaptersResponse"
+              
+      '403':
+        $ref: "#/components/responses/UnauthorizedError"
 
 
-/chapters/{id}:
+/stories/{storyId}/chapters/{id}:
   get:
     summary: Retrieve a chapter by ID
     parameters:
+      - name: storyId
+        in: path
+        required: true
+        schema:
+          type: string
       - name: id
         in: path
         required: true
@@ -52,13 +46,18 @@
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/Chapters"
+              $ref: "#/components/schemas/ChaptersResponse"
       '404':
         $ref: "#/components/responses/NotFoundError"
 
   put:
     summary: update a chapter.
     parameters:
+      - name: storyId
+        in: path
+        required: true
+        schema:
+          type: string
       - name: id
         in: path
         required: true
@@ -70,27 +69,39 @@
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/Chapters"
+            $ref: "#/components/schemas/ChaptersPutRequest"
     responses:
       '200':
         description: OK
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/Chapters"
-
+              $ref: "#/components/schemas/ChaptersResponse"
+      '403':
+        $ref: "#/components/responses/UnauthorizedError"
       '404':
         $ref: "#/components/responses/NotFoundError"
 
   delete:
     summary: Delete a chapter by ID
     operationId: deleteChapter
     parameters:
+      - name: storyId
+        in: path
+        required: true
+        schema:
+          type: string
       - name: id
         in: path
         required: true
         schema:
           type: string
     responses:
       '200':
-        description: OK
+        description: Successful request.
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/SuccessMessageResponse"
+      '403':
+        $ref: "#/components/responses/UnauthorizedError"

app/api/chapters/chapters.controller.js

@@ -1,97 +1,71 @@
-const { Stories_chapters } = require('../../models');
+const models = require("../../models");
+const { notFoundError } = require('../../utils/errors');
+const { validateStoryRight } = require('../../utils/story');
+const { route } = require("../../utils/express");
 
-
-//get all the chapters
-const getChapters = async (req, res) => {
-  try {
-    const chapters = await Stories_chapters.sequelize.query(`
-    SELECT stories_chapters.title, stories_chapters.type, picture_id,
-    stories_chapters.url_media, stories_chapters.description, stories_chapters.zoom, stories_chapters.story, 
-    ST_X(images.location) as longitude, ST_Y(images.location) as latitude
-    FROM stories_chapters, images 
-    WHERE stories_chapters.picture_id = images.id`,
-    {type: Stories_chapters.sequelize.QueryTypes.SELECT},
-    )
-    res.json(chapters);
-  } catch (error) {
-    res.status(500).json({ error: 'Une erreur s\'est produite lors de la récupération des chapitres.' });
-  }
-};
-
-
-//get a chapter by id
-const getChapterById = async (req, res) => {
+const getChapterById = route(async (req, res) => {
   const { id } = req.params;
-  try {
-    const chapter = await Stories_chapters.findByPk(id);
-    if (chapter) {
-      res.json(JSON.stringify({ "chapters": chapter }));
-    } else {
-      res.status(404).json({ error: 'Aucun chapitre trouvé avec cet ID.' });
-    }
-  } catch (error) {
-    res.status(500).json({ error: `Une erreur s'est produite lors de la récupération du chapitre avec l'ID ${id}.` });
+  const chapter = await models.stories_chapters.findByPk(id);
+  if (chapter) {
+    res.json(chapter);
+  } else {
+    throw notFoundError(req);
   }
-};
-
+});
 
 //Add a chapter to the db
-const addChapter = async (req, res) => {
-  const { title, type, picture_id, url_media, description, zoom, story, indexInStory } = req.body;
-  try {
-    const newChapter = await Stories_chapters.create({
+const addChapter = route(async (req, res) => {
+  await validateStoryRight(req, res, req.params.storyId);
+  const { storyId } = req.params;
+  const { title, type, picture_id, url_media, description, zoom, indexinstory, view_custom } = req.body;
+  const newChapter = await models.stories_chapters.create({
       title,
       type,
       picture_id,
       url_media,
       description,
       zoom,
-      story,
-      indexInStory
-    });
-    res.status(201).json(newChapter); // Return the ID of the newly created chapter
-  } catch (error) {
-    res.status(500).json({ error: 'Une erreur s\'est produite lors de l\'ajout du chapitre.' });
-  }
-};
+      story_id: storyId,
+      indexinstory,
+      view_custom
+  });
+  res.status(201).json(newChapter); // Return the ID of the newly created chapter
+});
 
 
 //Update a chapter
-const updateChapter = async (req, res) => {
-  const { title, type, picture_id, url_media, description, zoom, story, indexInStory  } = req.body;
-  try {
-    const updatedChapter = await Stories_chapters.update({
-      title,
-      type,
-      picture_id,
-      url_media,
-      description,
-      zoom,
-      story,
-      indexInStory
-    },{
+const updateChapter = route(async (req, res) => {
+  await validateStoryRight(req, res, req.params.storyId);
+  const { storyId, id } = req.params;
+  const { title, type, picture_id, url_media, description, zoom, indexinstory, view_custom } = req.body;
+  const updatedChapter = await models.stories_chapters.update({
+    title,
+    type,
+    picture_id,
+    url_media,
+    description,
+    zoom,
+    story_id: storyId,
+    indexinstory,
+    view_custom
+  },
+  {
+    where: {id: id}, returning: true, plain: true
+  });
+  res.status(200).json(updatedChapter[1]); // Return the ID of the newly created chapter
+});
 
-      where: {id: req.params.id},
-    });
-    res.status(201).json(updatedChapter); // Return the ID of the newly created chapter
-  } catch (error) {
-    res.status(500).json({ error: 'Une erreur s\'est produite lors de la misz à jour du chapitre.' });
-  }
-};
+const deleteChapter = route(async (req, res) => {
+  await validateStoryRight(req, res, req.params.storyId);
 
-const deleteChapter = async (req, res) =>{
-
-  try{
-    const deletedChapter = await Stories_chapters.destroy({where: {id:req.params.id}});
-    res.status(200).json(deletedChapter);
-
-  }catch(error){
-    res.status(500).json({error: "Une erreur c'est produite lors de la supression du chapitre"});
-  }
-}
+  await models.stories_chapters.destroy({where: {id:req.params.id}});
+  res.send({
+    message: "The story was deleted."
+  });
+
+});
 
 module.exports = {
-  getChapters,
   getChapterById,
   addChapter,
   updateChapter,