fix nginx.conf

dockerize whole project and fix docker issues
add profile related stuff  route/controller/service/schema
add poster and cover to elasticsearch
fix ejs rendering

Author: civilcoder55

.gitignore

@@ -12,4 +12,6 @@ server/parse-csv.js
 server/file.csv
 server/src/views/user/movies copy.ejs
 server/.eslintrc.json
-server/example.env
+server/example.env
+elasticsearch/
+mysql

docker-compose.yml

@@ -33,13 +33,15 @@ services:
     build: ./server
     container_name: streaming-app-nodejs
     volumes:
-      - ./server:/usr/src/app
+      - ./server:/usr/src/app/server
+      - ./media:/usr/src/app/media
     networks:
       - streaming-app-network
     depends_on: 
       - mysql
       - elasticsearch
       - redis
+    restart: always
 
   nginx:
     build: ./nginx

nginx/Dockerfile

@@ -38,7 +38,7 @@ RUN CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p')\
     unzip "lua-module.zip" -d /usr/src && \
     unzip "luajit2.zip" -d /usr/src && \
     unzip "lua-resty-core.zip" -d /usr/src && \
-    unzip "ua-resty-lrucache.zip" -d /usr/src && \
+    unzip "lua-resty-lrucache.zip" -d /usr/src && \
     export LUAJIT_LIB=/usr/local/luajit/lib && \
     export LUAJIT_INC=/usr/local/luajit/include/luajit-2.1 && \
     cd /usr/src/luajit2-2.1-20211210 && make && make install PREFIX=/usr/local/luajit && \

nginx/default.conf

@@ -21,7 +21,7 @@ server {
         header_filter_by_lua_block {
         local h = ngx.resp.get_headers()["x-userid"] or 0
             if (tonumber(h) < tonumber(ngx.var[1]) ) then
-                return ngx.exit(400)
+                return ngx.exit(401)
             end
         }
     }

nginx/nginx.conf

@@ -27,5 +27,6 @@ http {
     keepalive_timeout  65;
 
     #gzip  on;
+    client_max_body_size 100M;
     include /etc/nginx/conf.d/*.conf;
 }

server/Dockerfile

@@ -1,6 +1,6 @@
-FROM node:16-alpine
+FROM node:latest
 
-WORKDIR /usr/src/app
+WORKDIR /usr/src/app/server
 
 # COPY package.json package-lock.json ./
 # RUN npm install 

server/src/controllers/movie.controller.js

@@ -1,5 +1,5 @@
 // required packages
-// const config = require('../config')
+const config = require('../config')
 
 // required services
 const movieService = new (require('../services/movie.service'))()
@@ -46,7 +46,7 @@ module.exports = class MovieController {
       title: movie.title,
       relates: [],
       screenshots: [],
-      url: 'http://127.0.0.1:3005'
+      url: config.app.url
     })
   }
 

server/src/controllers/profile.controller.js

@@ -0,0 +1,39 @@
+// required services
+const profileService = new (require('../services/profile.service'))()
+
+module.exports = class ProfileController {
+  async index (req, res) {
+    return res.render('user/profile', { title: 'My Profile' })
+  }
+
+  async update (req, res) {
+    try {
+      await profileService.updateProfile({ user: req.user, body: req.body })
+      req.flash('success', 'Info saved successfuly')
+    } catch (error) {
+      req.flash('error', error.message)
+    }
+
+    return res.redirect('/profile')
+  }
+
+  async updatePassword (req, res) {
+    try {
+      await profileService.updatePassword({ user: req.user, body: req.body })
+      const maxAge = req.session.cookie.maxAge
+      return req.session.regenerate(_err => {
+        req.session.reload(_err => {
+          req.login(req.user, _err => {})
+          req.session.cookie.maxAge = maxAge
+          req.flash('success', 'Password changed successfuly')
+          req.session.save(_err => {
+            res.redirect('/profile')
+          })
+        })
+      })
+    } catch (error) {
+      req.flash('error', error.message)
+      return res.redirect('/profile')
+    }
+  }
+}

server/src/database/elasticsearch/create.js

@@ -9,6 +9,8 @@ module.exports = async function (movie) {
       title: movie.title,
       year: movie.year,
       rate: movie.rate,
+      poster: movie.poster,
+      cover: movie.cover,
       country: movie.country,
       description: movie.description,
       duration: movie.duration,

server/src/database/elasticsearch/initializer.js

@@ -39,6 +39,12 @@ const body = {
       duration: {
         enabled: false
       },
+      poster: {
+        enabled: false
+      },
+      cover: {
+        enabled: false
+      },
       rate: {
         type: 'double'
       },

server/src/database/elasticsearch/read.js

@@ -1,123 +1,118 @@
-//required packages
+// required packages
 const client = require('./client')
 
-
-
 const SORT = {
-    "Recent": { id: { order: "desc" } },
-    "Rating": { rate: { order: "desc" } },
-    "Year": { year: { order: "desc" } },
+  Recent: { id: { order: 'desc' } },
+  Rating: { rate: { order: 'desc' } },
+  Year: { year: { order: 'desc' } }
 }
 
-
 const getMovies = async ({ size, from, query, sortBy }) => {
-    let sort = []
-    if (SORT[sortBy]) {
-        sort.push(SORT[sortBy])
+  const sort = []
+  if (SORT[sortBy]) {
+    sort.push(SORT[sortBy])
+  }
+
+  console.log(JSON.stringify({
+    index: 'movies',
+    body: {
+      size,
+      from,
+      query,
+      sort
     }
+  }))
+
+  const result = await client.search({
+    index: 'movies',
+    body: {
+      size,
+      from,
+      query,
+      sort
+    }
+  })
 
-    console.log(JSON.stringify({
-        index: 'movies',
-        body: {
-            size,
-            from,
-            query,
-            sort
-        }
-    }))
-
-    const result = await client.search({
-        index: 'movies',
-        body: {
-            size,
-            from,
-            query,
-            sort
-        }
-    })
-
-    return result?.body?.hits?.hits
+  return result?.body?.hits?.hits
 }
 
-
 const getMoviesCount = async (query) => {
-    const result = await client.count({
-        index: 'movies',
-        body: {
-            query
-        }
-    })
+  const result = await client.count({
+    index: 'movies',
+    body: {
+      query
+    }
+  })
 
-    return result?.body?.count
+  return result?.body?.count
 }
 
 const buildFilterQuery = ({ genre, rate, year, q }) => {
-    const query = {
-        "bool": {
-            "must": [
-
-            ],
-            "filter": [
-            ]
-        }
-    }
-    if (q) {
-        query.bool.must.push({
-            "multi_match": {
-                "query": q,
-                "fields": ["title", "description"]
-            }
-        })
-    } else {
-        query.bool.must.push({ "match_all": {} })
-    }
+  const query = {
+    bool: {
+      must: [
 
-    if (genre) {
-        query.bool.filter.push({ "term": { "genre": genre } })
-    }
-    if (rate) {
-        query.bool.filter.push({ "range": { "rate": { "gte": rate } } })
+      ],
+      filter: [
+      ]
     }
-
-    if (year) {
-        query.bool.filter.push({ "term": { "year": year } })
-    }
-
-    return query
+  }
+  if (q) {
+    query.bool.must.push({
+      multi_match: {
+        query: q,
+        fields: ['title', 'description']
+      }
+    })
+  } else {
+    query.bool.must.push({ match_all: {} })
+  }
+
+  if (genre) {
+    query.bool.filter.push({ term: { genre: genre } })
+  }
+  if (rate) {
+    query.bool.filter.push({ range: { rate: { gte: rate } } })
+  }
+
+  if (year) {
+    query.bool.filter.push({ term: { year: year } })
+  }
+
+  return query
 }
 
 const paginator = async ({ size, page, filter, sort }) => {
-    page = parseInt(page) || 1;
-    size = parseInt(size) || 24;
-
-    const filterQuery = buildFilterQuery({ ...filter })
-    let count = await getMoviesCount(filterQuery)
-    count = count > 10000 ? 10000 : count
+  page = parseInt(page) || 1
+  size = parseInt(size) || 24
 
-    const pages = Math.ceil(count / size);
+  const filterQuery = buildFilterQuery({ ...filter })
+  let count = await getMoviesCount(filterQuery)
+  count = count > 10000 ? 10000 : count
 
-    const hasOther = pages > 1 ? true : false;
-    const hasNext = page < pages && hasOther ? true : false;
-    const hasPerv = page > 1 && hasOther ? true : false;
+  const pages = Math.ceil(count / size)
 
-    const from = (page - 1) * size <= 10000 ? (page - 1) * size : 10000 - size;
+  const hasOther = pages > 1
+  const hasNext = !!(page < pages && hasOther)
+  const hasPerv = !!(page > 1 && hasOther)
 
-    if (page > pages) {
-        page = pages;
-    }
+  const from = (page - 1) * size <= 10000 ? (page - 1) * size : 10000 - size
 
-    const records = await getMovies({ size, from, query: filterQuery, sortBy: sort })
+  if (page > pages) {
+    page = pages
+  }
 
-    return {
-        records,
-        page,
-        pages,
-        hasOther,
-        hasNext,
-        hasPerv,
-        count,
-    };
-};
+  const records = await getMovies({ size, from, query: filterQuery, sortBy: sort })
 
+  return {
+    records,
+    page,
+    pages,
+    hasOther,
+    hasNext,
+    hasPerv,
+    count
+  }
+}
 
-module.exports = paginator
+module.exports = paginator

server/src/database/elasticsearch/update.js

@@ -8,12 +8,14 @@ module.exports = async function (movie) {
         {
           conflicts: 'proceed',
           script: {
-            source: 'ctx._source.id=(params.id);ctx._source.title = (params.title);ctx._source.year = (params.year);ctx._source.country = (params.country);ctx._source.rate = (params.rate);ctx._source.description = (params.description);ctx._source.duration = (params.duration);ctx._source.genres = (params.genres);',
+            source: 'ctx._source.id=(params.id);ctx._source.title = (params.title);ctx._source.year = (params.year);ctx._source.country = (params.country);ctx._source.rate = (params.rate);ctx._source.poster = (params.poster);ctx._source.cover = (params.cover);ctx._source.description = (params.description);ctx._source.duration = (params.duration);ctx._source.genres = (params.genres);',
             params: {
               id: movie.id,
               title: movie.title,
               year: movie.year,
               rate: movie.rate,
+              poster: movie.poster,
+              cover: movie.cover,
               country: movie.country,
               description: movie.description,
               duration: movie.duration,

server/src/middlewares/validateBody.middleware.js

@@ -3,8 +3,10 @@ const { validationResult } = require('express-validator')
 function validate (req, res, next) {
   const error = validationResult(req).formatWith(({ msg }) => msg)
   if (!error.isEmpty()) {
-    console.log(error.array())
     req.flash('error', error.array())
+    if (req.originalUrl === '/change-password') {
+      return res.redirect('/profile')
+    }
     return res.redirect(req.originalUrl)
   }
   next()

server/src/queues/register.js

@@ -2,4 +2,4 @@ const transcodingProcessor = require('./processors/transcoding.processor')
 const { transcodingQueue } = require('./queue')
 
 transcodingQueue.process(transcodingProcessor)
-console.log('queue processors registerd')
+console.log('[*] Queue processors registerd')

server/src/router.js

@@ -7,5 +7,6 @@ router.use(require('./routes/auth.route')(passport))
 router.use(require('./routes/movie.route'))
 router.use('/admin', require('./routes/admin.route'))
 router.use(require('./routes/subscription.route'))
+router.use(require('./routes/profile.route'))
 
 module.exports = router