Compare commits
32 Commits
4e2803fcdb
...
test--test
Author | SHA1 | Date | |
---|---|---|---|
ef6fe94634 | |||
e1c6f0d281 | |||
0a85c94b03 | |||
feef7c4cf1 | |||
e3acfe1a92 | |||
6c93091109 | |||
bf94c5b262 | |||
0fda82da7a | |||
5df15bc219 | |||
dc0f478c38 | |||
18dd40fbb5 | |||
b857f54115 | |||
9ab3c401a6 | |||
6e557f159a | |||
c238c547b8 | |||
848ccbf5b4 | |||
2d2bb81b93 | |||
801ab51150 | |||
120ed8182a | |||
94b2ce2d16 | |||
04dfb78d57 | |||
9a098e1433 | |||
231af73f96 | |||
9c073640f3 | |||
708fc53e4e | |||
ad549e4e53 | |||
f1525ff55a | |||
93d45c77e0 | |||
636d71c852 | |||
13872bda29 | |||
27f4228862 | |||
c108e2c955 |
8
.github/workflows/build_docker_astro.yml
vendored
8
.github/workflows/build_docker_astro.yml
vendored
@ -6,9 +6,9 @@ on: #declancheur
|
|||||||
- '*'
|
- '*'
|
||||||
tags:
|
tags:
|
||||||
- v*
|
- v*
|
||||||
pull_request:
|
# pull_request:
|
||||||
branches:
|
# branches:
|
||||||
- master
|
# - master
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
run: #jobs ID (nom du jobs)
|
run: #jobs ID (nom du jobs)
|
||||||
@ -32,6 +32,8 @@ jobs:
|
|||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
type=semver,pattern={{major}}
|
type=semver,pattern={{major}}
|
||||||
type=semver,pattern=latest
|
type=semver,pattern=latest
|
||||||
|
labels: |
|
||||||
|
org.opencontainers.image.title=AstroFront
|
||||||
|
|
||||||
- name: Login to Gitea
|
- name: Login to Gitea
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
|
6
.github/workflows/build_docker_express.yml
vendored
6
.github/workflows/build_docker_express.yml
vendored
@ -32,6 +32,8 @@ jobs:
|
|||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
type=semver,pattern={{major}}
|
type=semver,pattern={{major}}
|
||||||
type=semver,pattern=latest
|
type=semver,pattern=latest
|
||||||
|
labels: |
|
||||||
|
org.opencontainers.image.title=AstroFront
|
||||||
|
|
||||||
- name: Login to Gitea
|
- name: Login to Gitea
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
@ -46,8 +48,8 @@ jobs:
|
|||||||
- name: Build and push back
|
- name: Build and push back
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: ./Express/barAndCafe
|
context: ./front
|
||||||
push: true
|
push: true
|
||||||
file: ./Express/barAndCafe/Dockerfile
|
file: ./front/Dockerfile
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
46
.github/workflows/build_jsdoc_drink.yml
vendored
46
.github/workflows/build_jsdoc_drink.yml
vendored
@ -1,46 +0,0 @@
|
|||||||
name: JsDocs
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
jobs:
|
|
||||||
coverage:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout # rapatrie le depot
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
|
|
||||||
- name: Docker meta
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
|
||||||
images: |
|
|
||||||
git.lab-ouest.org/Epitech/ratrapage_T-WEB_drink_jsdocs
|
|
||||||
tags: |
|
|
||||||
type=edge
|
|
||||||
type=ref,event=pr
|
|
||||||
type=ref,event=branch
|
|
||||||
type=semver,pattern={{version}}
|
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
type=semver,pattern={{major}}
|
|
||||||
type=semver,pattern=latest
|
|
||||||
|
|
||||||
- name: Login to Gitea
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: git.lab-ouest.org
|
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_TOKEN }}
|
|
||||||
|
|
||||||
# - name: Set up Docker Buildx
|
|
||||||
# uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Build and push docs
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: ./Express/barAndCafe
|
|
||||||
push: true
|
|
||||||
file: ./Express/barAndCafe/Dockerfile_docs
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
2
.github/workflows/run_back_test.yml
vendored
2
.github/workflows/run_back_test.yml
vendored
@ -17,5 +17,3 @@ jobs:
|
|||||||
custom-title: Coverage report for backend
|
custom-title: Coverage report for backend
|
||||||
github-token: ${{ secrets.PR_TOCKEN}}
|
github-token: ${{ secrets.PR_TOCKEN}}
|
||||||
annotations: none #disable annotation
|
annotations: none #disable annotation
|
||||||
env:
|
|
||||||
OPEN_TRIP_MAPS_KEY: ${{ secrets.OPEN_TRIP_MAPS_KEY}}
|
|
@ -1,3 +1,5 @@
|
|||||||
|
# This Dockerfile allows you to run AstroJS in server mode
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# Build #
|
# Build #
|
||||||
#########
|
#########
|
||||||
@ -47,8 +49,7 @@ WORKDIR /home/node
|
|||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
# Add Healthcheck
|
# Add Healthcheck
|
||||||
# FIXME: remttre check avec un port
|
HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
|
||||||
# HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
|
|
||||||
|
|
||||||
# copy from build image
|
# copy from build image
|
||||||
COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules
|
COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
#########
|
|
||||||
# Build #
|
|
||||||
#########
|
|
||||||
FROM docker.io/node:20-alpine as BUILD_IMAGE
|
|
||||||
|
|
||||||
# External deps (for node-gyp add: "python3 make g++")
|
|
||||||
RUN apk add --no-cache git
|
|
||||||
|
|
||||||
# run as non root user
|
|
||||||
USER node
|
|
||||||
|
|
||||||
# go to user repository
|
|
||||||
WORKDIR /home/node
|
|
||||||
|
|
||||||
# Add package json
|
|
||||||
ADD --chown=node:node package.json package-lock.json ./
|
|
||||||
|
|
||||||
# install dependencies from package lock
|
|
||||||
RUN npm ci
|
|
||||||
|
|
||||||
# Add project files
|
|
||||||
ADD --chown=node:node . .
|
|
||||||
|
|
||||||
# build
|
|
||||||
RUN npm run docs
|
|
||||||
|
|
||||||
# remove dev deps
|
|
||||||
RUN npm prune --omit=dev
|
|
||||||
|
|
||||||
##############
|
|
||||||
# Production #
|
|
||||||
##############
|
|
||||||
FROM httpd:alpine
|
|
||||||
|
|
||||||
COPY --from=BUILD_IMAGE /home/node/out/ /usr/local/apache2/htdocs/
|
|
@ -1,6 +1,5 @@
|
|||||||
/** @type {import('ts-jest').JestConfigWithTsJest} */
|
/** @type {import('ts-jest').JestConfigWithTsJest} */
|
||||||
module.exports = {
|
module.exports = {
|
||||||
testTimeout: 10000,
|
|
||||||
preset: 'ts-jest',
|
preset: 'ts-jest',
|
||||||
testEnvironment: 'node',
|
testEnvironment: 'node',
|
||||||
collectCoverage: true,
|
collectCoverage: true,
|
||||||
@ -11,7 +10,6 @@ module.exports = {
|
|||||||
'!/jest.config.js/',
|
'!/jest.config.js/',
|
||||||
'!/coverage/',
|
'!/coverage/',
|
||||||
'!**/server.ts',
|
'!**/server.ts',
|
||||||
'!**/swaggerDef.ts'
|
|
||||||
],
|
],
|
||||||
coverageThreshold: {
|
coverageThreshold: {
|
||||||
global: {
|
global: {
|
||||||
|
@ -3,18 +3,13 @@
|
|||||||
"template": "node_modules/better-docs"
|
"template": "node_modules/better-docs"
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"allowUnknownTags": true
|
"allowUnknownTags": ["optional"]
|
||||||
},
|
},
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"node_modules/better-docs/typescript",
|
"node_modules/better-docs/typescript"
|
||||||
"plugins/markdown",
|
|
||||||
"jsdoc-mermaid"
|
|
||||||
],
|
],
|
||||||
"source": {
|
"source": {
|
||||||
"include": ["./src"],
|
"include": ["./src"],
|
||||||
"includePattern": "\\.(jsx|js|ts|tsx)$"
|
"includePattern": "\\.(jsx|js|ts|tsx)$"
|
||||||
},
|
|
||||||
"templates": {
|
|
||||||
"search": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
1382
Express/barAndCafe/package-lock.json
generated
1382
Express/barAndCafe/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -2,40 +2,31 @@
|
|||||||
"main": "dist/server.js",
|
"main": "dist/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "rimraf dist && npx tsc",
|
"build": "rimraf dist && npx tsc",
|
||||||
"start": "node dist/src/server.js",
|
"start": "node dist/index.js",
|
||||||
"predev": "npm run build",
|
"predev": "npm run build",
|
||||||
"dev": "npx tsc -w & nodemon dist/src/server.js",
|
"dev": "npx tsc -w & nodemon dist/server.js",
|
||||||
"predocs": "npm run build",
|
|
||||||
"docs": "jsdoc -c jsdoc.json",
|
"docs": "jsdoc -c jsdoc.json",
|
||||||
"pretest": "npm run build",
|
"test": "jest"
|
||||||
"test": "ts-node -O '{\"module\":\"commonjs\"}' node_modules/jest/bin/jest.js"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/express": "^4.17.21",
|
"@types/express": "^4.17.21",
|
||||||
"@types/node": "^20.12.7",
|
"@types/node": "^20.12.7",
|
||||||
"axios": "^1.6.8",
|
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^16.4.5",
|
||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"rimraf": "^5.0.5",
|
"rimraf": "^5.0.5"
|
||||||
"swagger-jsdoc": "^6.2.8",
|
|
||||||
"swagger-ui-express": "^5.0.0"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "^29.5.12",
|
"@types/jest": "^29.5.12",
|
||||||
"@types/rewire": "^2.5.30",
|
|
||||||
"@types/supertest": "^6.0.2",
|
"@types/supertest": "^6.0.2",
|
||||||
"babel-cli": "^6.26.0",
|
"babel-cli": "^6.26.0",
|
||||||
"babel-preset-env": "^1.7.0",
|
"babel-preset-env": "^1.7.0",
|
||||||
"better-docs": "^2.7.3",
|
"better-docs": "^2.7.3",
|
||||||
"jest": "^29.7.0",
|
"jest": "^29.7.0",
|
||||||
"jsdoc": "^4.0.3",
|
"jsdoc": "^4.0.3",
|
||||||
"jsdoc-mermaid": "^1.0.0",
|
|
||||||
"nodemon": "^3.1.0",
|
"nodemon": "^3.1.0",
|
||||||
"rewire": "^7.0.0",
|
|
||||||
"superagent": "^9.0.2",
|
"superagent": "^9.0.2",
|
||||||
"supertest": "^7.0.0",
|
"supertest": "^7.0.0",
|
||||||
"ts-jest": "^29.1.2",
|
"ts-jest": "^29.1.2",
|
||||||
"ts-node": "^10.9.2",
|
|
||||||
"typedoc": "^0.25.13",
|
"typedoc": "^0.25.13",
|
||||||
"typescript": "^5.4.5"
|
"typescript": "^5.4.5"
|
||||||
}
|
}
|
||||||
|
@ -1,94 +1,22 @@
|
|||||||
import { getCity, getRadius } from "./openTripMaps"
|
import express from "express";
|
||||||
import express from "express"
|
|
||||||
/**
|
/**
|
||||||
* Initialize Express application instance.
|
* Initialize Express application instance.
|
||||||
* @returns An initialized Express application object.
|
* @returns An initialized Express application object.
|
||||||
*/
|
*/
|
||||||
const app = express()
|
const app = express();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle GET request for homepage route ('/welcome').
|
* Handle GET request for homepage route ('/').
|
||||||
* Send back a simple json response.
|
* Send back a simple text response.
|
||||||
* @param {express.Request} req - HTTP Request object.
|
* @param {express.Request} req - HTTP Request object.
|
||||||
* @param {express.Response} res - HTTP Response object.
|
* @param {express.Response} res - HTTP Response object.
|
||||||
*/
|
*/
|
||||||
function getWelcome(req: express.Request, res: express.Response) {
|
function getRoot(req: express.Request, res: express.Response) {
|
||||||
const out = {hello:"world"}
|
res.send("hello world from dev");
|
||||||
res.send(out)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
app.get("/", getRoot);
|
||||||
* @openapi
|
|
||||||
* /welcome:
|
|
||||||
* get:
|
|
||||||
* summary: retun just hello
|
|
||||||
* description: Welcome to swagger-jsdoc!
|
|
||||||
* responses:
|
|
||||||
* 200:
|
|
||||||
* description: Returns a welcome json.
|
|
||||||
*/
|
|
||||||
app.get("/welcome", getWelcome)
|
|
||||||
|
|
||||||
/**
|
export default app;
|
||||||
* @openapi
|
|
||||||
* /otm/city:
|
|
||||||
* get:
|
|
||||||
* summary: return the drinks in a city
|
|
||||||
* description: return the drinks in a defined perimeter in a city
|
|
||||||
* parameters:
|
|
||||||
* - name: name
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: the name of the city
|
|
||||||
* schema:
|
|
||||||
* type: string
|
|
||||||
* responses:
|
|
||||||
* 200:
|
|
||||||
* description: Return a list of bars and coffee in city in geoJSON format
|
|
||||||
* 400:
|
|
||||||
* description: Missing Argument Error
|
|
||||||
* 401:
|
|
||||||
* description: Missing OTM tocken
|
|
||||||
*/
|
|
||||||
app.get("/otm/city", getCity)
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @openapi
|
|
||||||
* /otm/radius:
|
|
||||||
* get:
|
|
||||||
* summary: return the drinks in a radius
|
|
||||||
* description: return the drinks in a defined radius
|
|
||||||
* parameters:
|
|
||||||
* - name: lon
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: longitude of the center of the radius
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -180
|
|
||||||
* maximum: 180
|
|
||||||
* - name: lat
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: latitude of the center of the radius
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -90
|
|
||||||
* maximum: 90
|
|
||||||
* - name: radius
|
|
||||||
* in: query
|
|
||||||
* description: size of the radius
|
|
||||||
* responses:
|
|
||||||
* 200:
|
|
||||||
* description: Return a list of bars and coffee in city in geoJSON format
|
|
||||||
* 400:
|
|
||||||
* description: Missing Argument Error
|
|
||||||
* 401:
|
|
||||||
* description: Missing OTM tocken
|
|
||||||
*/
|
|
||||||
app.get("/otm/radius", getRadius)
|
|
||||||
|
|
||||||
export default app
|
|
@ -1,103 +0,0 @@
|
|||||||
import axios from 'axios';
|
|
||||||
import express from "express"
|
|
||||||
import * as dotenv from "dotenv";
|
|
||||||
|
|
||||||
dotenv.config({path: '../../.env'})
|
|
||||||
const key = process.env.OPEN_TRIP_MAPS_KEY
|
|
||||||
|
|
||||||
/**
|
|
||||||
* make GET request to the OTM for radius search.
|
|
||||||
* @param {string} lon Longitude of radius center point
|
|
||||||
* @param {string} lat Latitude du point central du rayon
|
|
||||||
* @param {string} radius search radius size in meters
|
|
||||||
* @returns {FeatureCollection} a list of POIs with their type, id, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
|
|
||||||
*/
|
|
||||||
async function callRadius(lon: string, lat: string, radius = '1000') {
|
|
||||||
const optionsDrink = {
|
|
||||||
method: 'GET',
|
|
||||||
url: 'https://api.opentripmap.com/0.1/en/places/radius',
|
|
||||||
params: {
|
|
||||||
radius: radius,
|
|
||||||
lon: lon,
|
|
||||||
lat: lat,
|
|
||||||
apikey: key,
|
|
||||||
kinds: 'bars,cafes,pubs,biergartens'
|
|
||||||
},
|
|
||||||
headers: {'Content-Type': 'application/json'}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { data } = await axios.request(optionsDrink);
|
|
||||||
return data
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* make GET request to the OTM for city info.
|
|
||||||
* @param {string} name Name of a city
|
|
||||||
* @returns {Geoname} info of a search city their name, country, lat, lon, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
|
|
||||||
*/
|
|
||||||
async function callCity(name:string) {
|
|
||||||
const optionsCity = {
|
|
||||||
method: 'GET',
|
|
||||||
url: 'https://api.opentripmap.com/0.1/en/places/geoname',
|
|
||||||
params: {
|
|
||||||
name: name,
|
|
||||||
apikey: key
|
|
||||||
},
|
|
||||||
headers: {'Content-Type': 'application/json'}
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { data } = await axios.request(optionsCity);
|
|
||||||
return data
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle GET request for city search route ('/otm/city').
|
|
||||||
* @param {express.Request} req - HTTP Request object.
|
|
||||||
* @param {express.Response} res - HTTP Response object.
|
|
||||||
*/
|
|
||||||
export async function getCity(req: express.Request, res: express.Response) {
|
|
||||||
const cityName = req.query["name"]
|
|
||||||
let radius = req.query["radius"]
|
|
||||||
|
|
||||||
if(!cityName){
|
|
||||||
res.status(400).send("Missing Argument name")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if(!radius){
|
|
||||||
radius = "1000"
|
|
||||||
}
|
|
||||||
const cityPose = await callCity(cityName as string)
|
|
||||||
res.send( await callRadius(cityPose.lon,cityPose.lat, radius as string))
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle GET request for radius search route ('/otm/radius').
|
|
||||||
* @param {express.Request} req - HTTP Request object.
|
|
||||||
* @param {express.Response} res - HTTP Response object.
|
|
||||||
*/
|
|
||||||
export async function getRadius(req:express.Request, res: express.Response) {
|
|
||||||
const lon = req.query["lon"] as string
|
|
||||||
const lat = req.query["lat"] as string
|
|
||||||
let radius = req.query["radius"]
|
|
||||||
if(!lon || !lat){
|
|
||||||
res.status(400).send("Missing Argument name")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if(!radius){
|
|
||||||
radius = "1000"
|
|
||||||
}
|
|
||||||
|
|
||||||
res.send( await callRadius(lon,lat,radius as string))
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: fair une route ou l'on donne l'id un établicement pour avoir des détailles
|
|
||||||
//TODO: fair une route ou l'on donne 2 coordonée
|
|
@ -1,16 +1,10 @@
|
|||||||
import * as dotenv from "dotenv";
|
import * as dotenv from "dotenv";
|
||||||
import app from "./app";
|
import app from "./app";
|
||||||
import options from "./swaggerDef";
|
|
||||||
const swaggerJsdoc = require("swagger-jsdoc"),
|
|
||||||
swaggerUi = require("swagger-ui-express");
|
|
||||||
|
|
||||||
dotenv.config({path: '../../.env'})
|
dotenv.config({path: '../../.env'})
|
||||||
|
|
||||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
const port = parseInt(process.env.BAR_PORT || '3000')
|
||||||
|
|
||||||
const specs = swaggerJsdoc(options)
|
|
||||||
app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(specs))
|
|
||||||
|
|
||||||
app.listen(port, () =>{
|
app.listen(port, () =>{
|
||||||
console.log(`serveur running in ${port}`)
|
console.log(`serveur running in ${port}`)
|
||||||
})
|
})
|
@ -1,29 +0,0 @@
|
|||||||
import * as dotenv from "dotenv";
|
|
||||||
dotenv.config({path: '../../.env'})
|
|
||||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
|
||||||
|
|
||||||
|
|
||||||
const options = {
|
|
||||||
definition: {
|
|
||||||
openapi: "3.1.0",
|
|
||||||
info: {
|
|
||||||
title: "LogRocket Express API with Swagger",
|
|
||||||
version: "0.1.0",
|
|
||||||
description:
|
|
||||||
"This is a simple CRUD API application made with Express and documented with Swagger",
|
|
||||||
},
|
|
||||||
servers: [
|
|
||||||
{
|
|
||||||
url: "http://localhost:"+port.toString(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
url: "https://drink-tweb.cb85.fr"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
},
|
|
||||||
apis: ['./src/*.ts'],
|
|
||||||
explorer: true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export default options
|
|
@ -1,30 +1,37 @@
|
|||||||
import request from "supertest";
|
import request from "supertest";
|
||||||
import app from "../src/app";
|
import app from "../src/app";
|
||||||
import { Server, IncomingMessage, ServerResponse } from "http";
|
import { Server, IncomingMessage, ServerResponse } from "http";
|
||||||
import * as dotenv from "dotenv";
|
|
||||||
|
|
||||||
dotenv.config({path: '../../.env'})
|
const port = 3000;
|
||||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
|
||||||
|
|
||||||
let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
|
let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
|
||||||
|
|
||||||
describe("Test the welcome path", () => {
|
describe("Test the root path", () => {
|
||||||
|
|
||||||
test("It should response the 200 code for GET method", done => {
|
beforeEach(() => {
|
||||||
|
serveur = app.listen(port, () =>{
|
||||||
|
console.log(`serveur running in ${port}`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
afterEach((done) => {
|
||||||
|
serveur.close(done)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("It should response the GET method", done => {
|
||||||
request(app)
|
request(app)
|
||||||
.get("/welcome")
|
.get("/")
|
||||||
.then(response => {
|
.then(response => {
|
||||||
expect(response.statusCode).toBe(200);
|
expect(response.statusCode).toBe(200);
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
test("It should response the GET method with content", done => {
|
test("It should response the GET method", done => {
|
||||||
const out = {hello:"world"};
|
|
||||||
request(app)
|
request(app)
|
||||||
.get("/welcome")
|
.get("/")
|
||||||
.then(response => {
|
.then(response => {
|
||||||
expect(response.text).toEqual(JSON.stringify(out))
|
expect(response.text).toEqual("hello world from dev")
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -1,111 +0,0 @@
|
|||||||
import request from "supertest";
|
|
||||||
import app from "../src/app";
|
|
||||||
import { Server, IncomingMessage, ServerResponse } from "http";
|
|
||||||
import * as dotenv from "dotenv";
|
|
||||||
|
|
||||||
dotenv.config({path: '../../.env'})
|
|
||||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
|
||||||
|
|
||||||
let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
|
|
||||||
|
|
||||||
describe("Test the otm city path", () => {
|
|
||||||
|
|
||||||
test("It should response the 200 code for GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/city")
|
|
||||||
.query({'name':'La roche sur yon'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(200);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("It should response the GET method with content", done => {
|
|
||||||
const out = {
|
|
||||||
"type": "FeatureCollection",
|
|
||||||
"features": [{
|
|
||||||
"type": "Feature",
|
|
||||||
"id": "562635",
|
|
||||||
"geometry": {
|
|
||||||
"type": "Point",
|
|
||||||
"coordinates": [
|
|
||||||
-1.4344594,
|
|
||||||
46.6686478
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"properties": {
|
|
||||||
"xid": "N4032296324",
|
|
||||||
"name": "Le 27 point carré",
|
|
||||||
"dist": 236.40360026,
|
|
||||||
"rate": 1,
|
|
||||||
"osm": "node/4032296324",
|
|
||||||
"kinds": "foods,bars,tourist_facilities"
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
|
|
||||||
request(app)
|
|
||||||
.get("/otm/city")
|
|
||||||
.query({'name':'La roche sur yon', "radius": 240})
|
|
||||||
.then(response => {
|
|
||||||
console.log(response.text)
|
|
||||||
expect(response.text).toEqual(JSON.stringify(out))
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("It should response the 400 code for GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/city")
|
|
||||||
.then(response => {
|
|
||||||
console.log(response.text)
|
|
||||||
expect(response.statusCode).toBe(400);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("It should response the 200 code for GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/radius")
|
|
||||||
.query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(200);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
//TODO faire les test pour les cas d'erreur
|
|
||||||
|
|
||||||
test("Get bar in radius from API", done => {
|
|
||||||
const out = {
|
|
||||||
"type": "FeatureCollection",
|
|
||||||
"features": [{
|
|
||||||
"type": "Feature",
|
|
||||||
"id": "562635",
|
|
||||||
"geometry": {
|
|
||||||
"type": "Point",
|
|
||||||
"coordinates": [
|
|
||||||
-1.4344594,
|
|
||||||
46.6686478
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"properties": {
|
|
||||||
"xid": "N4032296324",
|
|
||||||
"name": "Le 27 point carré",
|
|
||||||
"dist": 0.17652159,
|
|
||||||
"rate": 1,
|
|
||||||
"osm": "node/4032296324",
|
|
||||||
"kinds": "foods,bars,tourist_facilities"
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
request(app)
|
|
||||||
.get("/otm/radius")
|
|
||||||
.query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.text).toEqual(JSON.stringify(out));
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
|
||||||
});
|
|
@ -1,7 +1,3 @@
|
|||||||
vars {
|
|
||||||
TRIPMAP_URL: https://api.opentripmap.com/0.1
|
|
||||||
}
|
|
||||||
vars:secret [
|
vars:secret [
|
||||||
app_key,
|
app_key
|
||||||
OTM_KEY
|
|
||||||
]
|
]
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
meta {
|
meta {
|
||||||
name: express Drink OTM
|
name: express test
|
||||||
type: http
|
type: http
|
||||||
seq: 4
|
seq: 3
|
||||||
}
|
}
|
||||||
|
|
||||||
get {
|
get {
|
@ -1,19 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_drink
|
|
||||||
type: http
|
|
||||||
seq: 6
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: {{TRIPMAP_URL}}/en/places/radius?radius=10&lon=-1.4344594&lat=46.6686478&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
radius: 10
|
|
||||||
lon: -1.4344594
|
|
||||||
lat: 46.6686478
|
|
||||||
apikey: {{OTM_KEY}}
|
|
||||||
kinds: bars,cafes,pubs,biergartens
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_drink_id
|
|
||||||
type: http
|
|
||||||
seq: 7
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: https://api.opentripmap.com/0.1/en/places/xid/562635?apikey={{OTM_KEY}}
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
apikey: {{OTM_KEY}}
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_ex_city
|
|
||||||
type: http
|
|
||||||
seq: 8
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
name: La roche sur yon
|
|
||||||
radius: 300
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_ex_radius
|
|
||||||
type: http
|
|
||||||
seq: 9
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
name: La roche sur yon
|
|
||||||
radius: 300
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_location
|
|
||||||
type: http
|
|
||||||
seq: 5
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: {{TRIPMAP_URL}}/en/places/geoname?name=Paris&apikey={{OTM_KEY}}
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
name: Paris
|
|
||||||
apikey: {{OTM_KEY}}
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: test graphQL
|
|
||||||
type: graphql
|
|
||||||
seq: 3
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
url: https://datatour-tweb.cb85.fr
|
|
||||||
body: graphql
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
body:graphql {
|
|
||||||
{
|
|
||||||
poi {
|
|
||||||
total
|
|
||||||
results {
|
|
||||||
_uri
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Submodule datatourisme updated: b3bc1fdc68...fb594bfd7c
@ -1,14 +1,12 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
pocketbase:
|
pocketbase:
|
||||||
image: ghcr.io/coollabsio/pocketbase:latest
|
image: ghcr.io/coollabsio/pocketbase:latest
|
||||||
environment:
|
environment:
|
||||||
- SERVICE_FQDN_POCKETBASE_8080
|
- SERVICE_FQDN_POCKETBASE_8080
|
||||||
volumes:
|
volumes:
|
||||||
- ./pb/pocketbase-data:/app/pb_data
|
- ./.pb/pocketbase-data:/app/pb_data
|
||||||
- ./pb/pocketbase-hooks:/app/pb_hooks
|
- ./.pb/pocketbase-hooks:/app/pb_hooks
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.http.routers.poketBaseTweb.rule=Host(`${POCKET_BASE_URL}`)
|
- traefik.http.routers.poketBaseTweb.rule=Host(`${POCKET_BASE_URL}`)
|
||||||
@ -16,9 +14,8 @@ services:
|
|||||||
- traefik.http.routers.poketBaseTweb.tls.certresolver=le
|
- traefik.http.routers.poketBaseTweb.tls.certresolver=le
|
||||||
networks:
|
networks:
|
||||||
- public
|
- public
|
||||||
|
|
||||||
front:
|
front:
|
||||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-1-head
|
image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-7-head
|
||||||
depends_on:
|
depends_on:
|
||||||
- pocketbase
|
- pocketbase
|
||||||
labels:
|
labels:
|
||||||
@ -28,66 +25,10 @@ services:
|
|||||||
- traefik.http.routers.astroTweb.tls.certresolver=le
|
- traefik.http.routers.astroTweb.tls.certresolver=le
|
||||||
networks:
|
networks:
|
||||||
- public
|
- public
|
||||||
|
|
||||||
back_drink:
|
|
||||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head
|
|
||||||
labels:
|
|
||||||
- traefik.enable=true
|
|
||||||
- traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`)
|
|
||||||
- traefik.http.services.expressDrinkTweb.loadbalancer.server.port=${BACK_BASE_PORT}
|
|
||||||
- traefik.http.routers.expressDrinkTweb.tls.certresolver=le
|
|
||||||
networks:
|
|
||||||
- public
|
|
||||||
|
|
||||||
docs_drink:
|
|
||||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_drink_jsdocs:pr-6-head
|
|
||||||
labels:
|
|
||||||
- traefik.enable=true
|
|
||||||
- traefik.http.routers.docsDrinkTweb.rule=Host(`${DOCS_DRINK_URL}`)
|
|
||||||
- traefik.http.services.docsDrinkTweb.loadbalancer.server.port=${DOCS_BACK_BASE_PORT}
|
|
||||||
- traefik.http.routers.docsDrinkTweb.tls.certresolver=le
|
|
||||||
networks:
|
|
||||||
- public
|
|
||||||
|
|
||||||
|
|
||||||
blazegraph:
|
|
||||||
image: conjecto/blazegraph:2.1.5
|
|
||||||
# ports:
|
|
||||||
# - 9999:9999
|
|
||||||
environment:
|
|
||||||
JAVA_OPTS: -Xms6G -Xmx6G
|
|
||||||
volumes:
|
|
||||||
- ./datatourisme/dataset:/docker-entrypoint-initdb.d
|
|
||||||
ulimits:
|
|
||||||
nofile:
|
|
||||||
soft: 65536
|
|
||||||
hard: 65536
|
|
||||||
networks:
|
|
||||||
- graphQL
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
datatourisme:
|
|
||||||
image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
|
|
||||||
depends_on:
|
|
||||||
- blazegraph
|
|
||||||
networks:
|
|
||||||
- graphQL
|
|
||||||
- public
|
|
||||||
restart: unless-stopped
|
|
||||||
labels:
|
|
||||||
- traefik.enable=true
|
|
||||||
- traefik.http.routers.dataTourisme.rule=Host(`${DATA_TOURISME_URL}`)
|
|
||||||
- traefik.http.services.dataTourisme.loadbalancer.server.port=${DATA_TOURISME_BASE_PORT}
|
|
||||||
- traefik.http.routers.dataTourisme.tls.certresolver=le
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
graphQL: {}
|
|
||||||
public:
|
public:
|
||||||
external: true
|
external: true
|
||||||
x-dockge:
|
x-dockge:
|
||||||
urls:
|
urls:
|
||||||
- https://${POCKET_BASE_URL}/
|
- https://${POCKET_BASE_URL}/
|
||||||
- https://${FRONT_URL}/
|
- https://${FRONT_URL}/
|
||||||
- https://${DOCS_DRINK_URL}/
|
|
||||||
- https://${DRINK_URL}/
|
|
||||||
- https://${DATA_TOURISME_URL}/
|
|
Reference in New Issue
Block a user