Merge branch 'release/v1.0'

Author: Nouuu

.dockerignore

@@ -3,7 +3,9 @@
 .env*
 .gitignore
 dist
+logs
 test
+.github
 node_modules
 Procfile
 README.md

.env.example

@@ -17,4 +17,9 @@ PORT=3000
 LOG_LEVEL='debug'
 
 # App endpoint prefix
-ENDPOINT_PREFIX='api'
+ENDPOINT_PREFIX='api'
+
+# Send grid API key
+SENDGRID_API_KEY=''
+SENDGRID_SEND_EMAIL=''
+SENDGRID_REPLY_EMAIL=''

.github/workflows/cd.yml

@@ -31,3 +31,9 @@ jobs:
           context: .
           push: true
           tags: registry.vecolo.fr/veapi-ci:latest
+      
+      - name: Trigger API Webhook reload service
+        uses: joelwmale/webhook-action@2.1.0
+        with:
+          url: ${{ secrets.WEBHOOK_URL }}
+

Dockerfile

@@ -12,7 +12,11 @@ WORKDIR /usr/app
 COPY package*.json ormconfig.js ./
 RUN npm ci --production
 
+VOLUME /usr/app/upload
+VOLUME /usr/app/logs
+
 COPY --from=builder /usr/app/dist ./dist
+COPY ./media ./media
 
 ENV JWT_SECRET ='mon-token-secret' \
     DB_TYPE='mariadb' \
@@ -24,7 +28,12 @@ ENV JWT_SECRET ='mon-token-secret' \
     PORT=3000 \
     LOG_LEVEL='debug' \
     ENDPOINT_PREFIX='' \
-    NODE_ENV='production'
+    NODE_ENV='production'\
+    SENDGRID_API_KEY=''\
+    SENDGRID_SEND_EMAIL=''\
+    SENDGRID_REPLY_EMAIL=''\
+    RECAPTCHA_KEY=''
+
 
 EXPOSE 3000
 CMD node dist/app.js

commands/seed.ts

@@ -0,0 +1,50 @@
+import Logger from '../src/logger';
+import BikeModelService from '../src/api/services/BikeModelService';
+import {Container} from 'typedi';
+import databaseLoader from '../src/loaders/database';
+import BikeService from '../src/api/services/BikeService';
+import {BikeModel} from '../src/api/entities/BikeModel';
+import {Bike, BikeStatus} from '../src/api/entities/Bike';
+
+const fillCount = 5;
+
+const run = async () => {
+    Container.set('logger', Logger);
+    const log = Logger.info;
+    const connection = await databaseLoader();
+    log('Database connection loaded successfully!');
+
+    const bikeModelService: BikeModelService = Container.get(BikeModelService);
+    const bikeService: BikeService = Container.get(BikeService);
+
+    const modelList: BikeModel[] = await bikeModelService.getRepo().find();
+    const enumStatus = [
+        BikeStatus.OFF,
+        BikeStatus.RECHARGING,
+        BikeStatus.IN_RIDE,
+        BikeStatus.MAINTAINING,
+    ];
+
+    for (let i = 0; i < fillCount; i++) {
+        let matriculate;
+        while (!matriculate) {
+            matriculate = Math.floor(100000 + Math.random() * 100000).toString();
+            if (await bikeService.getRepo().findOne({where: {matriculate}})) {
+                matriculate = undefined;
+            }
+        }
+        const bike: Partial<Bike> = {
+            matriculate,
+            model: modelList[Math.floor(Math.random() * 1000) % modelList.length],
+            status: enumStatus[Math.floor(Math.random() * 100) % enumStatus.length],
+            recharging: true,
+            batteryPercent: Math.floor(Math.random() * 100),
+            station: null
+        };
+        const bikeDB = await bikeService.getRepo().save(bike);
+        log(`Bike ${bikeDB.id} inserted (${i + 1}/${fillCount})`);
+    }
+};
+
+
+run().then(r => console.log('Bikes Seeded'));

commands/seed_bike.ts

@@ -0,0 +1,39 @@
+import Logger from '../src/logger';
+import {Container} from 'typedi';
+import databaseLoader from '../src/loaders/database';
+import BikeService from '../src/api/services/BikeService';
+import {Bike} from '../src/api/entities/Bike';
+import StationService from '../src/api/services/StationService';
+
+const fillStationPercent = 90;
+
+const run = async () => {
+    Container.set('logger', Logger);
+    const log = Logger.info;
+    const connection = await databaseLoader();
+    log('Database connection loaded successfully!');
+
+    const bikeService: BikeService = Container.get(BikeService);
+    const stationService: StationService = Container.get(StationService);
+
+    const bikeList: Bike[] = await bikeService.getRepo().find({where: {station: null}});
+    for (const bike of bikeList) {
+        const station = await stationService.getRepo().createQueryBuilder('station')
+            .leftJoin('bike', 'b', 'b.stationId = station.id')
+            .select()
+            .addSelect('count(distinct b.id) as bikeCount')
+            .groupBy('station.id, station.bikeCapacity')
+            .having(`bikeCount < ROUND(station.bikeCapacity * ${fillStationPercent} / 100)`)
+            .getOne();
+        if (!station) {
+            log('Can\'t fill anymore station !');
+            return;
+        }
+        bike.station = station;
+        await bikeService.update(bike.id, bike);
+        log(`Bike ${bike.id} attached to station ${station.id}`);
+    }
+};
+
+
+run().then(r => console.log('Bikes on station Seeded'));

commands/seed_bike_on_station.ts

@@ -0,0 +1,85 @@
+import Logger from '../src/logger';
+import {Container} from 'typedi';
+import databaseLoader from '../src/loaders/database';
+import RideService from '../src/api/services/RideService';
+import UserService from '../src/api/services/UserService';
+import {User} from '../src/api/entities/User';
+import BikeService from '../src/api/services/BikeService';
+import {Station} from '../src/api/entities/Station';
+import StationService from '../src/api/services/StationService';
+import {Bike} from '../src/api/entities/Bike';
+import {Ride} from '../src/api/entities/Ride';
+import {addDays, addMinutes, differenceInCalendarDays} from 'date-fns';
+
+const rideCount = 10;
+const start = new Date();
+const end = new Date('2021-07-26');
+const difference = differenceInCalendarDays(end, start);
+
+const run = async () => {
+    Container.set('logger', Logger);
+    const log = Logger.info;
+    const connection = await databaseLoader();
+    log('Database connection loaded successfully!');
+
+    const rideService: RideService = Container.get(RideService);
+    const userService: UserService = Container.get(UserService);
+    const bikeService: BikeService = Container.get(BikeService);
+    const stationService: StationService = Container.get(StationService);
+
+    const userIds: { id: number }[] = await userService.getRepo().createQueryBuilder('user')
+        .select('id')
+        .getRawMany();
+
+    const stationIds: { id: number }[] = await stationService.getRepo().createQueryBuilder('station')
+        .select('id')
+        .getRawMany();
+
+    for (let i = 0; i < rideCount; i++) {
+        const user: User = await userService.findOne(userIds[Math.floor(Math.random() * 10000 % userIds.length)].id);
+        if (user.subscriptions?.length == 0) {
+            log(`User ${user.id} don't have subscription, skipping...`);
+            i--;
+            continue;
+        }
+        const startDate = addDays(start, Math.floor(Math.random() * difference));
+        const rideDuration = 1 + Math.floor(Math.random() * 60);
+        const endDate = addMinutes(startDate, rideDuration);
+
+        const startStation: Station = await stationService.findOne(stationIds[Math.floor(Math.random() * 10000 % stationIds.length)].id);
+        const endStation: Station = await stationService.getRepo().createQueryBuilder('station')
+            .leftJoin('bike', 'b', 'b.stationId = station.id')
+            .select()
+            .addSelect('count(distinct b.id) as bikeCount')
+            .groupBy('station.id, station.bikeCapacity')
+            .having(`bikeCount < station.bikeCapacity`)
+            .getOne();
+
+        const availableBikes: Bike[] = await bikeService.getAllFromStation(startStation.id, {limit: 100, offset: 0});
+        if (availableBikes.length == 0) {
+            log('Start station don\'t have available bikes, skipping...');
+            i--;
+            continue;
+        }
+
+        const ride: Ride = await rideService.startRide(
+            availableBikes[Math.floor(Math.random() * 10000 % availableBikes.length)],
+            startStation,
+            user,
+            startDate
+        );
+        await rideService.endRide(
+            user,
+            ride,
+            endStation,
+            Math.floor(rideDuration * Math.random() * 20),
+            endDate
+        );
+        log(`Ride ${ride.id} inserted (${i + 1}/${rideCount})`);
+    }
+
+
+};
+
+
+run().then(r => console.log('Rides Seeded'));