diff --git a/src/main/kotlin/com/restapi/Main.kt b/src/main/kotlin/com/restapi/Main.kt index a406555..2394f5b 100644 --- a/src/main/kotlin/com/restapi/Main.kt +++ b/src/main/kotlin/com/restapi/Main.kt @@ -221,16 +221,6 @@ fun main(args: Array) { "/{id}", ReminderCtrl::delete, Roles(Role.Explicit("ROLE_REMINDER_CREATE")) ) } - path("/vehicle") { - post("", VehicleCtrl::create, Roles(Role.Explicit("ROLE_FLEET_CREATE"))) - get( - "/{id}", VehicleCtrl::get, Roles(Role.Explicit("ROLE_FLEET_VIEW", "ROLE_FLEET_CREATE")) - ) - put("/{id}", VehicleCtrl::update, Roles(Role.Explicit("ROLE_FLEET_CREATE"))) - post( - "/getAll", VehicleCtrl::getAll, Roles(Role.Explicit("ROLE_FLEET_CREATE", "ROLE_FLEET_VIEW")) - ) - } path("/fleetType") { post("", FleetTypeCtrl::create, Roles(Role.Explicit("ROLE_FLEET_CREATE"))) get( diff --git a/src/main/kotlin/com/restapi/controllers/Fleets.kt b/src/main/kotlin/com/restapi/controllers/Fleets.kt index b4804f0..c80023c 100644 --- a/src/main/kotlin/com/restapi/controllers/Fleets.kt +++ b/src/main/kotlin/com/restapi/controllers/Fleets.kt @@ -53,43 +53,6 @@ object FleetCtrl { } } -object VehicleCtrl { - fun create(ctx: Context) { - val vehicle = ctx.bodyAsClass() - Session.database.save(vehicle) - ctx.json(vehicle).status(HttpStatus.CREATED) - } - - fun get(ctx: Context) { - val id = ctx.pathParam("id").toLong() - val vehicle = Session.database.find(Vehicle::class.java, id) - ?: throw NotFoundResponse("No vehicle found with id $id") - ctx.json(vehicle).status(HttpStatus.OK) - } - - fun getAll(ctx: Context) { - val vehicles = Session.database.find(Vehicle::class.java).findList() - val excel = ctx.queryParam("excel") - if (excel !== null) { - // exportVehicles(vehicles) - val inputStream = FileInputStream("./excel/Vehicles.xls") - ctx.result(inputStream).status(HttpStatus.OK) - } else { - ctx.json(vehicles).status(HttpStatus.OK) - } - - } - - fun update(ctx: Context) { - val id = ctx.pathParam("id").toLong() - val vehicle = - Session.database.find(Vehicle::class.java, id) ?: throw NotFoundResponse("vehicle not found for $id") - val updatedVehicle = ctx.bodyAsClass() - vehicle.patchValues(updatedVehicle) - vehicle.update() - ctx.json(vehicle).status(HttpStatus.OK) - } -} object FleetTypeCtrl { fun create(ctx: Context) { diff --git a/src/main/kotlin/com/restapi/domain/Fleets.kt b/src/main/kotlin/com/restapi/domain/Fleets.kt index bbb0b53..75b3951 100644 --- a/src/main/kotlin/com/restapi/domain/Fleets.kt +++ b/src/main/kotlin/com/restapi/domain/Fleets.kt @@ -55,16 +55,6 @@ open class FleetType : BaseTenantModel() { var name: String = "" var personIncharge: String = "" } - -@Entity -open class Vehicle : BaseTenantModel() { - fun patchValues(updated: Vehicle) { - this.name = updated.name - } - - var name: String = "" -} - @Entity open class Renewal : BaseTenantModel() { fun patchValues(updated: Renewal) {