WIP: Introduce docker, build container for the api and introduce mongodb image

Author: Jean Rauwers

backend/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log

backend/.gitignore

@@ -1,2 +1,3 @@
 node_modules
-.env
+.env
+data

backend/Dockerfile

@@ -0,0 +1,19 @@
+FROM node:14
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+# RUN npm install
+# If you are building your code for production
+RUN npm ci --only=production
+
+# Bundle app source
+COPY . .
+
+EXPOSE 8080
+CMD [ "node", "src/server.js" ]

backend/docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3"
+services:
+  node-api:
+    container_name: node-api
+    image: react-native-bootcamp/backend
+    restart: always
+    build: .
+    ports:
+      - "8080:8080"
+    links:
+      - mongo
+  mongo:
+    container_name: mongo
+    image: mongo
+    volumes:
+      - ./data:/data/db
+    ports:
+      - "27017:27017"

backend/package.json

@@ -6,7 +6,9 @@
   "scripts": {
     "lint": "eslint ./src --fix",
     "start": "node src/server.js",
-    "dev": "nodemon src/server.js"
+    "dev": "nodemon src/server.js",
+    "build-docker-image": "docker build . -t react-native-bootcamp/backend",
+    "run-docker-image": "docker-compose up"
   },
   "keywords": [],
   "author": "",
@@ -27,4 +29,4 @@
     "eslint": "^7.0.0",
     "nodemon": "^2.0.3"
   }
-}
+}

backend/src/controllers/EventController.js

@@ -2,14 +2,51 @@ const Event = require('../models/Event')
 const User = require('../models/User')
 const jwt = require('jsonwebtoken')
 
+
+
+
 module.exports = {
+	// reverting upload to S3
+	// createEvent(req, res) {
+	// 	jwt.verify(req.token, 'secret', async (err, authData) => {
+	// 		if (err) {
+	// 			res.statusCode(401)
+	// 		} else {
+	// 			const { title, description, price, sport, date } = req.body
+	// 			const { location } = req.file
+
+	// 			const user = await User.findById(authData.user._id)
+
+	// 			if (!user) {
+	// 				return res.status(400).json({ message: 'User does not exist!' })
+	// 			}
+
+	// 			try {
+	// 				const event = await Event.create({
+	// 					title,
+	// 					description,
+	// 					sport,
+	// 					price: parseFloat(price),
+	// 					user: authData.user._id,
+	// 					thumbnail: location,
+	// 					date
+	// 				})
+
+	// 				return res.json(event)
+	// 			} catch (error) {
+	// 				return res.status(400).json({ message: error })
+	// 			}
+	// 		}
+	// 	})
+
+	// },
 	createEvent(req, res) {
 		jwt.verify(req.token, 'secret', async (err, authData) => {
 			if (err) {
 				res.statusCode(401)
 			} else {
 				const { title, description, price, sport, date } = req.body
-				const { location } = req.file
+				const { filename } = req.file
 
 				const user = await User.findById(authData.user._id)
 
@@ -24,7 +61,7 @@ module.exports = {
 						sport,
 						price: parseFloat(price),
 						user: authData.user._id,
-						thumbnail: location,
+						thumbnail: filename,
 						date
 					})
 
@@ -34,7 +71,6 @@ module.exports = {
 				}
 			}
 		})
-
 	},
 
 	delete(req, res) {

backend/src/models/Event.js

@@ -1,3 +1,28 @@
+// reverting API to do not use S3
+// const mongoose = require('mongoose')
+
+// const EventSchema = new mongoose.Schema({
+// 	title: String,
+// 	description: String,
+// 	price: Number,
+// 	thumbnail: String,
+// 	sport: String,
+// 	date: Date,
+// 	user: {
+// 		type: mongoose.Schema.Types.ObjectId,
+// 		ref: 'User'
+// 	}
+// }, {
+// 	toJSON: {
+// 		virtuals: true
+// 	}
+// })
+
+// EventSchema.virtual('thumbnail_url').get(function () { return this.thumbnail })
+
+// module.exports = mongoose.model('Event', EventSchema)
+
+
 const mongoose = require('mongoose')
 
 const EventSchema = new mongoose.Schema({
@@ -17,6 +42,6 @@ const EventSchema = new mongoose.Schema({
 	}
 })
 
-EventSchema.virtual('thumbnail_url').get(function () { return this.thumbnail })
+EventSchema.virtual('thumbnail_url').get(function () { return `http://localhost:8080/files/${this.thumbnail}` })
 
 module.exports = mongoose.model('Event', EventSchema)

backend/src/routes.js

@@ -1,5 +1,6 @@
 const express = require('express')
 const verifyToken = require('./config/verifyToken')
+const multer = require('multer')
 
 const UserController = require('./controllers/UserController')
 const EventController = require('./controllers/EventController')
@@ -8,35 +9,38 @@ const LoginController = require('./controllers/LoginController')
 const RegistrationController = require('./controllers/RegistrationController')
 const ApprovalController = require('./controllers/ApprovalController')
 const RejectionController = require('./controllers/RejectionController')
-const uploadToS3 = require('./config/s3Upload');
+// const uploadToS3 = require('./config/s3Upload');  removing s3Upload support
+const uploadConfig = require('./config/upload')
 const routes = express.Router()
+const upload = multer(uploadConfig)
 
-routes.get('/status', (req, res) => {
+routes.get('/api/status', (req, res) => {
 	res.send({ status: 200 })
 })
 
 //Registration
-routes.post('/registration/:eventId', verifyToken, RegistrationController.create)
-routes.get('/registration', verifyToken, RegistrationController.getMyRegistrations)
-routes.get('/registration/:registration_id', RegistrationController.getRegistration)
-routes.post('/registration/:registration_id/approvals', verifyToken, ApprovalController.approval)
-routes.post('/registration/:registration_id/rejections', verifyToken, RejectionController.rejection)
+routes.post('/api/registration/:eventId', verifyToken, RegistrationController.create)
+routes.get('/api/registration', verifyToken, RegistrationController.getMyRegistrations)
+routes.get('/api/registration/:registration_id', RegistrationController.getRegistration)
+routes.post('/api/registration/:registration_id/approvals', verifyToken, ApprovalController.approval)
+routes.post('/api/registration/:registration_id/rejections', verifyToken, RejectionController.rejection)
 
 //Login
-routes.post('/login', LoginController.store)
+routes.post('/api/login', LoginController.store)
 
 //Dashboard
-routes.get('/dashboard/:sport', verifyToken, DashboardController.getAllEvents)
-routes.get('/dashboard', verifyToken, DashboardController.getAllEvents)
-routes.get('/user/events', verifyToken, DashboardController.getEventsByUserId)
-routes.get('/event/:eventId', verifyToken, DashboardController.getEventById)
+routes.get('/api/dashboard/:sport', verifyToken, DashboardController.getAllEvents)
+routes.get('/api/dashboard', verifyToken, DashboardController.getAllEvents)
+routes.get('/api/user/events', verifyToken, DashboardController.getEventsByUserId)
+routes.get('/api/event/:eventId', verifyToken, DashboardController.getEventById)
 
 //Events 
-routes.post('/event', verifyToken, uploadToS3.single('thumbnail'), EventController.createEvent)
-routes.delete('/event/:eventId', verifyToken, EventController.delete)
+// routes.post('/api/event', verifyToken, uploadToS3.single('thumbnail'), EventController.createEvent) removes s3 support
+routes.post('/api/event', verifyToken, upload.single('thumbnail'), EventController.createEvent)
+routes.delete('/api/event/:eventId', verifyToken, EventController.delete)
 
 //User
-routes.post('/user/register', UserController.createUser)
-routes.get('/user/:userId', UserController.getUserById)
+routes.post('/api/user/register', UserController.createUser)
+routes.get('/api/user/:userId', UserController.getUserById)
 
 module.exports = routes

backend/src/server.js

@@ -4,20 +4,18 @@ const cors = require('cors')
 const routes = require('./routes')
 const path = require('path')
 const http = require('http')
-const socketio = require('socket.io')
-const PORT = process.env.PORT || 8000
-
-
+// const socketio = require('socket.io')
+const PORT = process.env.PORT || 8080
 const app = express()
 const server = http.Server(app)
-const io = socketio(server)
 
-if (process.env.NODE_ENV !== 'production') {
-	require('dotenv').config()
-}
+// const io = socketio(server)
+// if (process.env.NODE_ENV !== 'production') {
+// 	require('dotenv').config()
+// }
 
 try {
-	mongoose.connect(process.env.MONGO_DB_SECRET, {
+	mongoose.connect('mongodb://mongo:27017/docker-node-mongo', {
 		useNewUrlParser: true,
 		useUnifiedTopology: true,
 	})
@@ -26,20 +24,19 @@ try {
 	console.log(error)
 }
 
-const connectUsers = {}
 
-io.on('connection', socket => {
-	const { user } = socket.handshake.query
+// const connectUsers = {};
+// io.on('connection', socket => {
+// 	const { user } = socket.handshake.query
+// 	connectUsers[user] = socket.id
+// })
 
-	connectUsers[user] = socket.id
-})
+// app.use((req, res, next) => {
+// 	req.io = io
+// 	req.connectUsers = connectUsers
+// 	return next()
+// })
 
-//app.use()
-app.use((req, res, next) => {
-	req.io = io
-	req.connectUsers = connectUsers
-	return next()
-})
 app.use(cors())
 app.use(express.json())
 app.use('/files', express.static(path.resolve(__dirname, '..', 'files')))