Merge pull request #18 from BSStudio/feature/update_end_result_endpoint

update db entity, to new specifications

Author: csikb

.gitignore

@@ -163,3 +163,5 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
+# Sdkman env config
+.sdkmanrc

Dockerfile

@@ -1,10 +1,10 @@
 # Update gradle/gradle-wrapper.properties accordingly
-ARG GRADLE=gradle:6.7.1-jdk11
+ARG GRADLE=gradle:6.8.3-jdk11
 ARG JDK=openjdk:11-slim
 
 FROM $GRADLE as build
 COPY . .
-RUN gradle build bootJar --parallel
+RUN gradle bootJar --parallel
 
 FROM $JDK
 WORKDIR /home/spring

data/src/main/java/hu/bsstudio/robonaut/entity/ScoreEntity.java

@@ -0,0 +1,13 @@
+package hu.bsstudio.robonaut.entity;
+
+import lombok.Data;
+
+@Data
+public class ScoreEntity {
+    // speed
+    private int speedScore;
+    private int bestSpeedTime;
+
+    // calculated
+    private int score;
+}

data/src/main/java/hu/bsstudio/robonaut/entity/TeamEntity.java

@@ -25,8 +25,6 @@ public class TeamEntity {
     private boolean safetyCarWasFollowed;
 
     // speed
-    private int speedScore;
-    private int speedBonusScore;
     private List<Integer> speedTimes;
 
     // audience
@@ -36,8 +34,6 @@ public class TeamEntity {
     // qualification
     private int qualificationScore;
 
-    // calculated
-    private int totalScore;
-    private int rank;
-    private int juniorRank;
+    private ScoreEntity juniorScore;
+    private ScoreEntity score;
 }

docker-compose.yaml

@@ -14,7 +14,7 @@ services:
     image: rabbitmq:management-alpine
     ports:
     - 127.0.0.1:5672:5672
-    - 127.0.0.1:8081:15672
+    - 127.0.0.1:8081:8081
   mongo:
     image: mongo:4.4.2-bionic
     ports:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Thu Mar 05 16:36:07 CET 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

integration/package.json

@@ -16,6 +16,6 @@
     "@types/supertest": "^2.0.10"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest -i"
   }
 }

integration/src/amqp-operations.js

@@ -3,6 +3,10 @@ const amqp = require('amqplib')
 
 const AMQP_HOST = process.env.AMQP_HOST;
 
+function closeConnection(connection) {
+    if (connection) connection.close()
+}
+
 const purgeQueue = (queue) => {
     let _connection;
     return amqp.connect(AMQP_HOST)
@@ -11,7 +15,7 @@ const purgeQueue = (queue) => {
             return connection.createChannel();
         })
         .then(channel => channel.purgeQueue(queue))
-        .then(() => _connection.close())
+        .finally(() => closeConnection(_connection))
 }
 
-exports.purgeQueue = purgeQueue
+exports.purgeQueue = purgeQueue

integration/src/db-operations.js

@@ -4,12 +4,10 @@ const {MongoClient} = require('mongodb')
 const DB_URI = process.env.DB_HOST
 
 const cleanDB = () => {
-    const mongoClient = new MongoClient(DB_URI)
+    const mongoClient = new MongoClient(DB_URI, { useUnifiedTopology: true })
     return mongoClient.connect()
-        .then(client => {
-            return client.db().dropDatabase()
-        })
-        .then(() => mongoClient.close())
+        .then(client => client.db().dropDatabase())
+        .finally(() => mongoClient.close())
 }
 
 const createDummyData = () => {
@@ -18,7 +16,7 @@ const createDummyData = () => {
             return {
                 _id: i,
                 year: 2022,
-                teamName: "Budvári Sschönherz Stúdió",
+                teamName: "Budvári Schönherz Stúdió",
                 teamMembers: [
                     "Boldizsár Márta",
                     "Bence Csik"
@@ -49,7 +47,7 @@ const fill = () => {
             const dummyData = createDummyData();
             return collection.insertMany(dummyData);
         })
-        .then(() => mongoClient.close())
+        .finally(() => mongoClient.close())
 }
 
 exports.cleanDB = cleanDB

integration/test/authorization.test.js

@@ -1,7 +1,6 @@
-require('dotenv').config()
 const request = require('supertest')
 
-const HOST = process.env.HOST_NAME;
+const {HOST_NAME} = process.env;
 
 describe('Authorization test', () => {
     const postEndpoint = [
@@ -13,30 +12,34 @@ describe('Authorization test', () => {
         '/api/speed/safetyCar/overtake',
         '/api/speed/timer',
         '/api/speed/lap',
-        '/api/speed/result',
+        '/api/speed/result/senior',
+        '/api/speed/result/junior',
         '/api/scores/qualification',
         '/api/scores/audience',
-        '/api/scores/endResult'
+        '/api/scores/endResult/senior',
+        '/api/scores/endResult/junior'
     ];
     test.each(postEndpoint)('POST %p endpoint should return unauthorized', (endpoint) => {
-        return request(HOST)
+        return request(HOST_NAME)
             .post(endpoint)
             .then(response => {
                 expect(response.status).toBe(401)
             });
     });
-
     test('GET "/api/team" endpoint should return unauthorized', () => {
-        return request(HOST)
-            .post('/api/team')
+        return request(HOST_NAME)
+            .get('/api/team')
             .then(response => {
                 expect(response.status).toBe(401)
             });
     });
-
-    test('PUT "/api/team" endpoint should return unauthorized', () => {
-        return request(HOST)
-            .post('/api/team')
+    const putEndpoints = [
+        '/api/admin/team',
+        '/api/team',
+    ];
+    test.each(putEndpoints)('PUT %p endpoint should return unauthorized', (endpoint) => {
+        return request(HOST_NAME)
+            .put(endpoint)
             .then(response => {
                 expect(response.status).toBe(401)
             });