Compare commits

..

No commits in common. "d85c126c276a91996178ccf8b8e7a566d33dac69" and "37baa4ea45e64fce0cc5e14bbb29b7aabed22145" have entirely different histories.

6 changed files with 75 additions and 109 deletions

View File

@ -4,5 +4,4 @@ DB_HOST=bla
DB_PORT=bla
DB_USER=bla
DB_PASSWORD=bla
DB_NAME=bla
NODE_ENV=production
DB_NAME=bla

View File

@ -5,25 +5,22 @@ import consola from "consola";
import loaders from "./loaders/index";
import authchecker from "./authchecker";
import { ErrorHandler } from './middlewares/ErrorHandler';
//
dotenvSafe.config();
const PORT = process.env.APP_PORT || 4010;
const app = createExpressServer({
authorizationChecker: authchecker,
middlewares: [ErrorHandler],
development: process.env.NODE_ENV === "production",
cors: true,
routePrefix: "/api",
controllers: [__dirname + "/controllers/*.ts"],
authorizationChecker: authchecker,
middlewares: [ErrorHandler],
development: false,
controllers: [`${__dirname}/controllers/*.ts`],
});
async function main() {
await loaders(app);
app.listen(PORT, () => {
consola.success(
`⚡️[server]: Server is running at http://localhost:${PORT}`
);
});
}
main();
(async () => {
await loaders(app);
app.listen(PORT, () => {
consola.success(
`⚡️[server]: Server is running at http://localhost:${PORT}`
);
});
})();

View File

@ -1,92 +1,64 @@
import { JsonController, Param, Body, Get, Post, Put, Delete, NotFoundError, OnUndefined, NotAcceptableError, Authorized } from 'routing-controllers';
import { getConnectionManager, Repository } from 'typeorm';
import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
import { Track } from '../models/Track';
import { IsInt, IsNotEmpty, IsPositive, IsString } from 'class-validator';
import {
JsonController,
Param,
Body,
Get,
Post,
Put,
Delete,
Authorized,
} from "routing-controllers";
import { getConnectionManager, Repository } from "typeorm";
import { EntityFromBody } from "typeorm-routing-controllers-extensions";
import { ResponseSchema } from "routing-controllers-openapi";
import { Track } from "../models/Track";
import { IsInt, IsNotEmpty, IsPositive, IsString } from "class-validator";
class CreateTrack {
@IsString()
@IsNotEmpty()
name: string;
@IsString()
@IsNotEmpty()
name: string;
@IsInt()
@IsPositive()
length: number;
@IsInt()
@IsPositive()
length: string;
}
export class TrackNotFoundError extends NotFoundError {
constructor() {
super('Track not found!');
}
}
@JsonController('/tracks')
@Authorized("TRACKS:read")
@JsonController("/track")
// @Authorized("TRACKS:read")
export class TrackController {
private trackRepository: Repository<Track>;
private trackRepository: Repository<Track>;
/**
* Gets the repository of this controller's model/entity.
*/
constructor() {
this.trackRepository = getConnectionManager().get().getRepository(Track);
}
constructor() {
this.trackRepository = getConnectionManager().get().getRepository(Track);
}
@Get()
@ResponseSchema(Track, { isArray: true })
@OpenAPI({ description: "Lists all tracks." })
getAll() {
return this.trackRepository.find();
}
@Get()
@ResponseSchema(Track, { isArray: true })
getAll() {
return this.trackRepository.find();
}
@Get('/:id')
@ResponseSchema(Track)
@OnUndefined(TrackNotFoundError)
@OpenAPI({ description: "Returns a track of a specified id (if it exists)" })
getOne(@Param('id') id: number) {
return this.trackRepository.findOne({ id: id });
}
@Get("/:id")
@ResponseSchema(Track)
getOne(@Param("id") id: number) {
return this.trackRepository.findOne({ id: id });
}
@Post()
@ResponseSchema(Track)
@OpenAPI({ description: "Create a new track object (id will be generated automagicly)." })
post(
@Body({ validate: true })
track: CreateTrack
) {
return this.trackRepository.save(track);
}
@Authorized()
@Post()
post(@Body({ validate: true }) track: CreateTrack) {
return this.trackRepository.save(track);
}
@Put('/:id')
@ResponseSchema(Track)
@OpenAPI({ description: "Update a track object (id can't be changed)." })
async put(@Param('id') id: number, @EntityFromBody() track: Track) {
let oldTrack = await this.trackRepository.findOne({ id: id });
@Authorized("TRACKS:write")
@Put("/:id")
put(@Param("id") id: number, @EntityFromBody() track: Track) {
return this.trackRepository.update({ id: id }, track);
}
if (!oldTrack) {
throw new TrackNotFoundError();
}
if (oldTrack.id != track.id) {
throw new NotAcceptableError("The id's don't match!");
}
await this.trackRepository.update(oldTrack, track);
return track;
}
@Delete('/:id')
@ResponseSchema(Track)
@OpenAPI({ description: "Delete a specified track (if it exists)." })
async remove(@Param('id') id: number) {
let track = await this.trackRepository.findOne({ id: id });
if (!track) {
throw new TrackNotFoundError();
}
await this.trackRepository.delete(track);
return track;
}
@Delete("/:id")
remove(@Param("id") id: number) {
return this.trackRepository.delete({ id: id });
}
}

View File

@ -3,6 +3,12 @@ import bodyParser from 'body-parser';
import cors from 'cors';
export default async (app: Application) => {
app.get('/status', (req, res) => res.status(200).end());
app.enable('trust proxy');
app.use(cors());
// app.use(bodyParser.urlencoded({ extended: false }));
// more middlewares
return app;
};

View File

@ -11,9 +11,7 @@ export default async (app: Application) => {
});
const spec = routingControllersToSpec(
storage,
{
routePrefix: "/api"
},
{},
{
components: {
schemas,
@ -29,11 +27,11 @@ export default async (app: Application) => {
explorer: true,
};
app.use(
"/api/docs",
"/docs",
swaggerUiExpress.serve,
swaggerUiExpress.setup(spec, options)
);
app.get(["/api/openapi.json", "/api/swagger.json"], (req, res) => {
app.get(["/openapi.json", "/swagger.json"], (req, res) => {
res.json(spec);
});
return app;

View File

@ -7,12 +7,6 @@ import {
IsString,
} from "class-validator";
/**
* @classdesc Defines a track of given length.
* @property {number} id - Autogenerated unique id
* @property {string} name - The track's name
* @property {number} lenth - The track's length in meters
*/
@Entity()
export class Track {
@PrimaryGeneratedColumn()
@ -28,5 +22,5 @@ export class Track {
@Column()
@IsInt()
@IsPositive()
length: number;
length: string;
}