🚀Bumped version to v1.1.2

Reviewed-on: #206
Reviewed-by: Philipp Dormann <philipp@noreply.git.odit.services>

.drone.yml

@@ -163,6 +163,12 @@ steps:
         - "${DRONE_TAG}"
       cache: true
       registry: registry.odit.services
+  - name: trigger node lib build
+    image: idcooldi/drone-webhook
+    settings:
+      urls: https://ci.odit.services/api/repos/lfk/lfk-client-node/builds?SOURCE_TAG=${DRONE_TAG}
+      bearer:
+        from_secret: ci_token
   - name: trigger js lib build
     image: idcooldi/drone-webhook
     settings:

.gitignore

@@ -136,3 +136,4 @@ build
 lib
 /oss-attribution
 *.tmp
+pnpm-lock.yaml

CHANGELOG.md

@@ -2,16 +2,8 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v1.1.3](https://git.odit.services/lfk/backend/compare/v1.1.2...v1.1.3)
-
-- feat(orgs): Also resolve child-teams' distances and add them to org total [`8d94186`](https://git.odit.services/lfk/backend/commit/8d9418635d3e381c0f55a2521a3334ba497c169a)
-- fix(orgs): Removed unused log [`f2832a2`](https://git.odit.services/lfk/backend/commit/f2832a2daecc7bc7bbee4d4fceeab8db194730cf)
-
 #### [v1.1.2](https://git.odit.services/lfk/backend/compare/v1.1.1...v1.1.2)
 
-> 10 May 2023
-
-- 🚀Bumped version to v1.1.2 [`0d21596`](https://git.odit.services/lfk/backend/commit/0d21596e2b64a99258d4925ae2ad627d5cdbd984)
 - feat(groups): Resolve the total group distance on group get single (aka get org and get team) [`245827e`](https://git.odit.services/lfk/backend/commit/245827e9c659cf76183dc33ab253becc22ddf032)
 - chore(package): Formatting [`4608a36`](https://git.odit.services/lfk/backend/commit/4608a36df6b187520ca0c331b8dce615205257be)
 

Dockerfile

@@ -1,5 +1,5 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as build
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as build
 ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
 
@@ -14,7 +14,7 @@ RUN pnpm run build \
     && pnpm i --production --prefer-offline
 
 # final image
-FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as final
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as final
 WORKDIR /app
 COPY --from=build /app/package.json /app/package.json
 COPY --from=build /app/ormconfig.js /app/ormconfig.js

README.md

@@ -15,24 +15,24 @@ Backend Server
 
 1. Rename the .env.example file to .env (you can adjust app port and other settings, if needed)
 2. Install Dependencies
-```bash
+   ```bash
-pnpm i
+   yarn
-```
+   ```
 3. Start the server
-```bash
+   ```bash
-pnpm dev
+   yarn dev
-```
+   ```
 
 ### Run Tests
 ```bash
 # Run tests once (server has to run)
-pnpm test
+yarn test
 
 # Run test in watch mode (reruns on change)
-pnpm test:watch
+yarn test:watch
 
 # Run test in ci mode (automaticly starts the dev server)
-pnpm test:ci
+yarn test:ci
 ```
 
 ### Use your own mail templates
@@ -44,7 +44,7 @@ Currently the following templates exist:
 
 ### Generate Docs
 ```bash
-pnpm docs
+yarn docs
 ```
 
 ## ENV Vars
@@ -90,5 +90,5 @@ pnpm docs
    * The dev tag of the docker image get's build from this
    * Only push minor changes to this branch!
    * To merge a feature branch into this please create a pull request
-* feature/xyz: Feature branches - naming scheme: `feature/issueid-title`
+* feature/xyz: Feature branches - nameing scheme: `feature/issueid-title`
-* bugfix/xyz: Branches for bugfixes - naming scheme:`bugfix/issueid-title`
+* bugfix/xyz: Branches for bugfixes - nameing scheme:`bugfix/issueid-title`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-backend",
-  "version": "1.1.3",
+  "version": "1.1.2",
   "main": "src/app.ts",
   "repository": "https://git.odit.services/lfk/backend",
   "engines": {
@@ -54,7 +54,7 @@
     "validator": "13.5.2"
   },
   "devDependencies": {
-    "@faker-js/faker": "7.6.0",
+    "@faker-js/faker": "^7.6.0",
     "@odit/license-exporter": "0.0.9",
     "@types/cors": "2.8.9",
     "@types/csvtojson": "1.1.5",
@@ -63,7 +63,7 @@
     "@types/jsonwebtoken": "8.5.0",
     "@types/node": "14.14.22",
     "@types/uuid": "8.3.0",
-    "auto-changelog": "2.4.0",
+    "auto-changelog": "^2.4.0",
     "cp-cli": "2.0.0",
     "jest": "26.6.3",
     "nodemon": "2.0.7",
@@ -114,4 +114,4 @@
       "docs/*"
     ]
   }
-}
+}

src/controllers/RunnerOrganizationController.ts

@@ -52,7 +52,7 @@ export class RunnerOrganizationController {
 	@OnUndefined(RunnerOrganizationNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the organization whose id got provided.' })
 	async getOne(@Param('id') id: number) {
-		let runnerOrg = await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['contact', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.scans.track', 'runners', 'runners.scans', 'runners.scans.track'] });
+		let runnerOrg = await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['contact', 'teams', 'runners', 'runners.scans', 'runners.scans.track'] });
 		if (!runnerOrg) { throw new RunnerOrganizationNotFoundError(); }
 		return new ResponseRunnerOrganization(runnerOrg);
 	}

src/models/responses/ResponseRunnerGroup.ts

@@ -48,6 +48,7 @@ export abstract class ResponseRunnerGroup implements IResponse {
         this.id = group.id;
         this.name = group.name;
         if (group.contact) { this.contact = group.contact.toResponse(); };
+        console.log(group.runners)
         if (group.runners) { this.total_distance = group.runners.reduce((p, c) => p + c.distance, 0) }
     }
 }

src/models/responses/ResponseRunnerOrganization.ts

@@ -67,9 +67,6 @@ export class ResponseRunnerOrganization extends ResponseRunnerGroup implements I
             for (let team of org.teams) {
                 this.teams.push(team.toResponse());
             }
-            for (const team of this.teams) {
-                this.total_distance += team.total_distance;
-            }
         }
 
         if (!org.key) { this.registrationEnabled = false; }

src/seeds/SeedUsers.ts

@@ -11,7 +11,7 @@ import { PermissionAction } from '../models/enums/PermissionAction';
 import { PermissionTarget } from '../models/enums/PermissionTargets';
 /**
  * Seeds a admin group with a demo user into the database for initial setup and auto recovery.
- * We know that the naming isn't perfectly fitting. Feel free to change it.
+ * We know that the nameing isn't perfectly fitting. Feel free to change it.
  */
 export default class SeedUsers implements Seeder {
     public async run(factory: Factory, connection: Connection): Promise<any> {