Compare commits
	
		
			6 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						bb213f001e
	
				 | 
					
					
						|||
| 
						
						
							
						
						5415cd38a7
	
				 | 
					
					
						|||
| 
						
						
							
						
						175ba52ffa
	
				 | 
					
					
						|||
| 
						
						
							
						
						5c5000a218
	
				 | 
					
					
						|||
| 
						
						
							
						
						d559d04031
	
				 | 
					
					
						|||
| 
						
						
							
						
						2af682d1dd
	
				 | 
					
					
						
							
								
								
									
										21
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -2,8 +2,29 @@
 | 
			
		||||
 | 
			
		||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 | 
			
		||||
 | 
			
		||||
#### [1.3.5](https://git.odit.services/lfk/backend/compare/1.3.4...1.3.5)
 | 
			
		||||
 | 
			
		||||
- feat(runners): Generate selfservice urls on runner if requested or create/update/get single [`5415cd3`](https://git.odit.services/lfk/backend/commit/5415cd38a727e76632a01a4d2634a1777df5542c)
 | 
			
		||||
 | 
			
		||||
#### [1.3.4](https://git.odit.services/lfk/backend/compare/1.3.3...1.3.4)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- feat: add runnersViaSelfservice to statsControllerGet [`5c5000a`](https://git.odit.services/lfk/backend/commit/5c5000a218b47815e6846ac8b857dcd1995bfa6f)
 | 
			
		||||
- chore(release): 1.3.4 [`175ba52`](https://git.odit.services/lfk/backend/commit/175ba52ffae8e6ba1fdc1603ac2f5eba15602046)
 | 
			
		||||
 | 
			
		||||
#### [1.3.3](https://git.odit.services/lfk/backend/compare/v1.3.2...1.3.3)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): 1.3.3 [`d559d04`](https://git.odit.services/lfk/backend/commit/d559d0403191c703fd6da0e3f3dab53eec9258c0)
 | 
			
		||||
- ci: remove "v" prefix from tags [`2af682d`](https://git.odit.services/lfk/backend/commit/2af682d1dd09df496eb9f3a9111c50c0c4117356)
 | 
			
		||||
 | 
			
		||||
#### [v1.3.2](https://git.odit.services/lfk/backend/compare/v1.3.1...v1.3.2)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): v1.3.2 [`30905e4`](https://git.odit.services/lfk/backend/commit/30905e481c69cfe62b4261544b4277de3a1a43c2)
 | 
			
		||||
- ci: pnpm@10.7 [`752d405`](https://git.odit.services/lfk/backend/commit/752d405bda9129f3cd288a956d5444cab316c2af)
 | 
			
		||||
 | 
			
		||||
#### [v1.3.1](https://git.odit.services/lfk/backend/compare/1.3.0...v1.3.1)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "@odit/lfk-backend",
 | 
			
		||||
  "version": "1.3.2",
 | 
			
		||||
  "version": "1.3.5",
 | 
			
		||||
  "main": "src/app.ts",
 | 
			
		||||
  "repository": "https://git.odit.services/lfk/backend",
 | 
			
		||||
  "author": {
 | 
			
		||||
@@ -91,12 +91,12 @@
 | 
			
		||||
    "git": {
 | 
			
		||||
      "commit": true,
 | 
			
		||||
      "requireCleanWorkingDir": false,
 | 
			
		||||
      "commitMessage": "chore(release): v${version}",
 | 
			
		||||
      "commitMessage": "chore(release): ${version}",
 | 
			
		||||
      "requireBranch": "dev",
 | 
			
		||||
      "push": true,
 | 
			
		||||
      "tag": true,
 | 
			
		||||
      "tagName": "v${version}",
 | 
			
		||||
      "tagAnnotation": "v${version}"
 | 
			
		||||
      "tagName": "${version}",
 | 
			
		||||
      "tagAnnotation": "${version}"
 | 
			
		||||
    },
 | 
			
		||||
    "npm": {
 | 
			
		||||
      "publish": false
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,7 @@ export class RunnerController {
 | 
			
		||||
	@Authorized("RUNNER:GET")
 | 
			
		||||
	@ResponseSchema(ResponseRunner, { isArray: true })
 | 
			
		||||
	@OpenAPI({ description: 'Lists all runners from all teams/orgs. <br> This includes the runner\'s group and distance ran.' })
 | 
			
		||||
	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
 | 
			
		||||
	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100, @QueryParam("selfservice_links", { required: false }) selfservice_links: boolean = false) {
 | 
			
		||||
		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 | 
			
		||||
		let runners: Array<Runner>;
 | 
			
		||||
 | 
			
		||||
@@ -41,7 +41,7 @@ export class RunnerController {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner));
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner, selfservice_links));
 | 
			
		||||
		});
 | 
			
		||||
		return responseRunners;
 | 
			
		||||
	}
 | 
			
		||||
@@ -55,7 +55,7 @@ export class RunnerController {
 | 
			
		||||
	async getOne(@Param('id') id: number) {
 | 
			
		||||
		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] })
 | 
			
		||||
		if (!runner) { throw new RunnerNotFoundError(); }
 | 
			
		||||
		return new ResponseRunner(runner);
 | 
			
		||||
		return new ResponseRunner(runner, true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Get('/:id/scans')
 | 
			
		||||
@@ -98,7 +98,7 @@ export class RunnerController {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		runner = await this.runnerRepository.save(runner)
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }), true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Put('/:id')
 | 
			
		||||
@@ -119,7 +119,7 @@ export class RunnerController {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		await this.runnerRepository.save(await runner.update(oldRunner));
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }), true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Delete('/:id')
 | 
			
		||||
 
 | 
			
		||||
@@ -23,6 +23,7 @@ export class StatsController {
 | 
			
		||||
    @OpenAPI({ description: "A very basic stats endpoint providing basic counters for a dashboard or simmilar" })
 | 
			
		||||
    async get() {
 | 
			
		||||
        const connection = getConnection();
 | 
			
		||||
        const runnersViaSelfservice = await connection.getRepository(Runner).count({ where: { created_via: "selfservice" } });
 | 
			
		||||
        const runners = await connection.getRepository(Runner).count();
 | 
			
		||||
        const teams = await connection.getRepository(RunnerTeam).count();
 | 
			
		||||
        const orgs = await connection.getRepository(RunnerOrganization).count();
 | 
			
		||||
@@ -41,7 +42,7 @@ export class StatsController {
 | 
			
		||||
        let donations = await connection.getRepository(Donation).find({ relations: ['runner', 'runner.scans', 'runner.scans.track'] });
 | 
			
		||||
        const donors = await connection.getRepository(Donor).count();
 | 
			
		||||
 | 
			
		||||
        return new ResponseStats(runners, teams, orgs, users, scans, donations, distace, donors)
 | 
			
		||||
        return new ResponseStats(runnersViaSelfservice, runners, teams, orgs, users, scans, donations, distace, donors)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Get("/runners/distance")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,10 @@
 | 
			
		||||
import {
 | 
			
		||||
    IsInt,
 | 
			
		||||
    IsObject
 | 
			
		||||
    IsObject,
 | 
			
		||||
    IsOptional,
 | 
			
		||||
    IsString
 | 
			
		||||
} from "class-validator";
 | 
			
		||||
import { JwtCreator } from '../../jwtcreator';
 | 
			
		||||
import { Runner } from '../entities/Runner';
 | 
			
		||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
 | 
			
		||||
import { IResponse } from './IResponse';
 | 
			
		||||
@@ -30,14 +33,26 @@ export class ResponseRunner extends ResponseParticipant implements IResponse {
 | 
			
		||||
    @IsObject()
 | 
			
		||||
    group: ResponseRunnerGroup;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * A selfservice link for our new runner.
 | 
			
		||||
     */
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    @IsString()
 | 
			
		||||
    selfserviceLink: string;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a ResponseRunner object from a runner.
 | 
			
		||||
     * @param runner The user the response shall be build for.
 | 
			
		||||
     */
 | 
			
		||||
    public constructor(runner: Runner) {
 | 
			
		||||
    public constructor(runner: Runner, generateSelfServiceLink: boolean = false) {
 | 
			
		||||
        super(runner);
 | 
			
		||||
        if (!runner.scans) { this.distance = 0 }
 | 
			
		||||
        else { this.distance = runner.validScans.reduce((sum, current) => sum + current.distance, 0); }
 | 
			
		||||
        if (runner.group) { this.group = runner.group.toResponse(); }
 | 
			
		||||
 | 
			
		||||
        if (generateSelfServiceLink) {
 | 
			
		||||
            const token = JwtCreator.createSelfService(runner);
 | 
			
		||||
            this.selfserviceLink = `${process.env.SELFSERVICE_URL}/profile/${token}`;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,12 @@ export class ResponseStats implements IResponse {
 | 
			
		||||
    */
 | 
			
		||||
    responseType: ResponseObjectType = ResponseObjectType.STATS;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The amount of runners registered via selfservice.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    runnersViaSelfservice: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The amount of runners registered in the system.
 | 
			
		||||
     */
 | 
			
		||||
@@ -84,14 +90,16 @@ export class ResponseStats implements IResponse {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a new stats response containing some basic statistics for a dashboard or public display.
 | 
			
		||||
     * @param runners Array containing all runners - the following relations have to be resolved: scans, scans.track
 | 
			
		||||
     * @param teams Array containing all teams - no relations have to be resolved.
 | 
			
		||||
     * @param orgs Array containing all orgs - no relations have to be resolved.
 | 
			
		||||
     * @param users Array containing all users - no relations have to be resolved.
 | 
			
		||||
     * @param scans Array containing all scans - no relations have to be resolved.
 | 
			
		||||
     * @param runnersViaSelfservice number of runners registered via selfservice
 | 
			
		||||
     * @param runners number of runners
 | 
			
		||||
     * @param teams number of teams - no relations have to be resolved.
 | 
			
		||||
     * @param orgs number of orgs - no relations have to be resolved.
 | 
			
		||||
     * @param users number of users - no relations have to be resolved.
 | 
			
		||||
     * @param scans number of scans - no relations have to be resolved.
 | 
			
		||||
     * @param donations Array containing all donations - the following relations have to be resolved: runner, runner.scans, runner.scans.track
 | 
			
		||||
     */
 | 
			
		||||
    public constructor(runners: number, teams: number, orgs: number, users: number, scans: number, donations: Donation[], distance: number, donors: number) {
 | 
			
		||||
    public constructor(runnersViaSelfservice: number, runners: number, teams: number, orgs: number, users: number, scans: number, donations: Donation[], distance: number, donors: number) {
 | 
			
		||||
        this.runnersViaSelfservice = runnersViaSelfservice;
 | 
			
		||||
        this.total_runners = runners;
 | 
			
		||||
        this.total_teams = teams;
 | 
			
		||||
        this.total_orgs = orgs;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user