Merge pull request #50 from sensebox/feat-osem-integration

Feat osem integration

.env.example

@@ -0,0 +1 @@
+DATABASE_URL="postgresql://postgres:example@localhost:5432/sensor-wiki?schema=public"

.gitignore

@@ -1,2 +1,6 @@
 ./node_modules
 node_modules
+
+.env
+
+data

Dockerfile

@@ -1,9 +1,15 @@
-FROM node:12-alpine as build
+FROM node:16-alpine as build
 
 ENV NODE_ENV=production
 
-RUN apk --no-cache --virtual .build add build-base python2 git
-
+RUN apk --no-cache --virtual .build add build-base python3 git
+RUN apk --update --no-cache add \
+    libc6-compat \
+    automake \
+    autoconf \
+    build-base \
+    zlib \
+    zlib-dev
 WORKDIR /usr/src/app
 
 # copy in main package.json and yarn.lock
@@ -13,11 +19,13 @@ RUN npm install --production
 COPY . /usr/src/app
 
 # Final stage
-FROM node:12-alpine
+FROM node:16-alpine
 
 ENV NODE_ENV=production
+ENV DATABASE_URL=production
 
 WORKDIR /usr/src/app
 COPY --from=build /usr/src/app /usr/src/app
+RUN npx prisma generate
 
-CMD [ "npm", "start" ]
+CMD npm start

README.md

@@ -0,0 +1,44 @@
+# Sensor Wiki API
+
+
+
+# Install
+
+Install requirements
+```sh
+yarn install
+```
+
+Copy env file
+```sh
+cp .env.example .env
+```
+
+Start PostgreSQL DB
+```sh
+docker-compose up 
+```
+
+If you want to load the Dump file:
+
+Connect to PostgreSQL docker container
+```sh
+docker exec -it ID bash
+```
+
+Load Dump File
+```sh
+psql -U DB_USERNAME -d DB_NAME < dataDump.sql
+```
+
+If you dont want to load the dump file:
+
+Migrate DB
+```sh
+npx prisma migrate dev
+```
+
+Start node application
+```
+npx nodemon
+```

app.js

@@ -6,11 +6,12 @@ var logger = require('morgan');
 var bodyParser = require("body-parser");
 
 var indexRouter = require('./routes/index');
-var queriesRouter = require('./routes/queries');
+// var queriesRouter = require('./routes/queries');
 var sensorsRouter = require('./routes/sensors');
 var phenomenaRouter = require('./routes/phenomena');
 var devicesRouter = require('./routes/devices');
 var domainsRouter = require('./routes/domains');
+var unitsRouter = require('./routes/units');
 var imageRouter = require('./routes/image');
 var AuthController = require('./controllers/auth-controller');
 var cors = require('cors')
@@ -50,11 +51,12 @@ app.post('*', AuthController.isAuthenticated, function (req, res, next) {
 });
 
 app.use('/', indexRouter);
-app.use('/queries', queriesRouter);
+// app.use('/queries', queriesRouter);
 app.use('/sensors', sensorsRouter);
 app.use('/phenomena', phenomenaRouter);
 app.use('/devices', devicesRouter);
 app.use('/domains', domainsRouter);
+app.use('/units', unitsRouter);
 app.use('/image', imageRouter);
 app.use(express.static('owl'));
 

controllers/auth-controller.js

@@ -1,7 +1,7 @@
 var request = require('request');
 
 const AUTH_API_URL = 'https://api.testing.opensensemap.org/'
- 
+
 module.exports.isAuthenticated = async function isAuthenticated(req, res, next){
   const token = req.headers.authorization;
   const options = {