Extended tp registrations

app.js

@@ -370,6 +370,7 @@ app.delete('/tp/:id', tp);
 app.get('/tp/:id', tp);
 app.put('/tp/:id/reserve/now', tp);
 app.put('/tp/:id/reserve/stop', tp);
+app.put('/tp/:id/reserve/extend', tp);
 
 app.get('/auth', auth);
 app.post('/auth/:id', auth);

core/tps.service.js

@@ -29,6 +29,7 @@ var STATUS_EXPIRED = 'Expired';
 exports.tp_reservation = tp_reservation;
 exports.create_tp_reservation = create_tp_reservation;
 exports.remove_tp_reservation = remove_tp_reservation;
+exports.extend_tp_reservation = extend_tp_reservation;
 
 
 async function createExtraGroup(trainingName, ownerName) {
@@ -253,6 +254,25 @@ async function remove_tp_reservation(reservation_id) {
 
 }
 
+async function extend_tp_reservation(reservation_id, new_reservation) {
+    logger.info('Extend reservation', reservation_id);
+
+    let reservation = await dbsrv.mongo_reservations().findOne({'_id': reservation_id});
+    logger.debug('Extend reservation', reservation);
+
+    try {
+        await dbsrv.mongo_reservations().updateOne(
+            {'_id': reservation_id},
+            {'$set': { 'to': new_reservation.to } }
+        );
+        await dbsrv.mongo_events().insertOne({ 'owner': 'auto', 'date': new Date().getTime(), 'action': 'extend reservation for ' + reservation.owner , 'logs': [] });
+
+    } catch (error) {
+        logger.error(error);
+    }
+
+}
+
 async function create_tp_reservation(reservation_id) {
 
     logger.info('Create reservation', reservation_id);

manager2/src/app/tps/tps.component.html

@@ -93,13 +93,42 @@ <h3>Reservation</h3>
                     </table>
                 </div>
                 <button *ngIf="!selectedEvent.created && !selectedEvent.over && authorized" class="p-button p-button-sm p-button-secondary" (click)="cancel_reservation()">Cancel</button>
+                <!-- <button *ngIf="selectedEvent.created && authorized && !session_user.is_admin" class="p-button p-button-sm p-button-primary" (click)="ask_extend_reservation()">Ask for Extension</button> -->
                 <button *ngIf="!selectedEvent.created && session_user.is_admin" class="p-button p-button-sm p-button-primary" (click)="create_reservation()">Create</button>
                 <button *ngIf="selectedEvent.created && !selectedEvent.over && session_user.is_admin" class="p-button p-button-sm p-button-warning" (click)="remove_reservation()">Remove</button>
+                <button *ngIf="selectedEvent.created && !selectedEvent.over && session_user.is_admin" type="button" class="p-button p-button-sm p-button-primary" data-toggle="modal" data-target="#extend">Extend</button>
             </div>
         </div>
     </div>
 </div>
 
+<div class="modal" style="z-index: 1500;" id="extend" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3>Extend TP {{ selectedEvent ? selectedEvent.name : '' }}</h3>
+            </div>
+            <form aria-label="TP extension request form" role="form" class="user-form form-horizonal">
+                <div class="modal-body">
+                <div class="form-group row col-sm-8">
+                    <label for="new_expire">New Expiration Date&nbsp;
+                        <span style="color:red">(required)&nbsp;</span>
+                        <span class="glyphicon glyphicon-question-sign" title="Project expiration date" tooltip></span>
+                    </label>
+                    <input required id="new_expire" [ngModelOptions]="{standalone: true}" [(ngModel)]="new_expire" type="date" class="form-control"/>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                <div class="form-group row col-sm-12">
+                    <button type="button" class="p-button p-button-sm p-button-primary" (click)="extend_reservation(new_expire)" data-dismiss="modal">Extend</button>
+                    <button type="button" class="p-button p-button-sm p-button-secondary" data-dismiss="modal">Cancel</button>
+                </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
 <div *ngIf="authorized" class="row">
     <div class="col-md-8">
         <div class="card bg-light">

manager2/src/app/tps/tps.component.ts

@@ -39,6 +39,8 @@ export class TpsComponent implements OnInit {
 
     activeDayIsOpen: boolean = true;
 
+    new_expire: Date
+
     constructor(
         private authService: AuthService,
         private configService: ConfigService,
@@ -174,6 +176,21 @@ export class TpsComponent implements OnInit {
         this.listEvents();
     }
 
+    extend_reservation(new_expire: Date) {
+        this.msg = '';
+        this.errmsg = '';
+        if (new Date(this.new_expire).getTime() < this.selectedEvent.end) {  // Why did we rename the 'to' field to 'end' for selected events (l.59) ?
+            this.errmsg = 'Extended end date must be after current end date';
+            return;
+        }
+        const new_reservation = { ...this.selectedEvent, to: new Date(this.new_expire).getTime() };
+        this.tpService.extend(this.selectedEvent.id, new_reservation).subscribe(
+            resp => this.msg = resp['message'],
+            err => this.errmsg = err.error.message
+        );
+        this.listEvents();
+    }
+
     eventClicked(clickedEvent) {
         let event = clickedEvent.event;
         this.selectedEvent = event.meta;

manager2/src/app/tps/tpservice.service.ts

@@ -66,4 +66,15 @@ export class TpserviceService {
 
         return this.http.put(environment.apiUrl + '/tp/' + reservationId + '/reserve/stop', httpOptions)
     }
+
+    extend(reservationId, new_reservation): Observable<any> {
+        //let user = this.authService.profile;
+        let httpOptions = {
+            //headers: new HttpHeaders({
+            //  'x-api-key': user.apikey
+            //}),
+        };
+
+        return this.http.put(environment.apiUrl + '/tp/' + reservationId + '/reserve/extend', new_reservation, httpOptions)
+    }
 }

routes/tp.js

@@ -264,7 +264,7 @@ router.put('/tp/:id/reserve/stop', async function(req, res) {
         tpssrv.remove_tp_reservation(reservation_id);
     } catch (error) {
         logger.error(error);
-        res.status(500).send({message: 'Error will removing tp reservation'});
+        res.status(500).send({message: 'Error while removing tp reservation'});
         res.end();
         return;
     }
@@ -328,7 +328,7 @@ router.put('/tp/:id/reserve/now', async function(req, res) {
         newresa = await tpssrv.create_tp_reservation(reservation_id, 'auto');
     } catch (error) {
         logger.error(error);
-        res.status(500).send({message: 'Error will creating tp reservation'});
+        res.status(500).send({message: 'Error while creating tp reservation'});
         res.end();
         return;
     }
@@ -339,4 +339,71 @@ router.put('/tp/:id/reserve/now', async function(req, res) {
     res.end();
 });
 
+router.put('/tp/:id/reserve/extend', async function(req, res) {
+    if(! req.locals.logInfo.is_logged) {
+        res.status(403).send({message: 'Not authorized'});
+        return;
+    }
+    if(! sansrv.sanitizeAll([req.params.id])) {
+        res.status(403).send({message: 'Invalid parameters'});
+        return;
+    }
+    let user = null;
+    let isadmin = false;
+    try {
+        user = await dbsrv.mongo_users().findOne({'_id': req.locals.logInfo.id});
+        isadmin = await rolsrv.is_admin(user);
+    } catch(e) {
+        logger.error(e);
+        res.status(404).send({message: 'User session not found'});
+        res.end();
+        return;
+    }
+
+    if(!user) {
+        res.status(404).send({message: 'User does not exist'});  // Why do none of the other routes give a 404 status here ?
+        res.end();
+        return;
+    }
+
+    if(! (isadmin || (user.is_trainer !== undefined && user.is_trainer))) {
+        res.status(403).send({message: 'Not authorized'});
+        return;
+    }
+
+    let reservation_id = ObjectID.createFromHexString(req.params.id);
+
+    let filter = {};
+    if(isadmin) {
+        filter = {_id: reservation_id};
+    }
+    else{
+        filter = {_id: reservation_id, owner: user.uid};
+    }
+    let reservation = await dbsrv.mongo_reservations().findOne(filter);
+    if(!reservation){
+        res.status(403).send({message: 'Not allowed to extend this reservation'});
+        res.end();
+        return;
+    }
+
+    if (req.body.to < reservation.to) {
+        res.status(403).send({message: 'Extended end date must be after current end date'});
+        // Should I add "res.end();" here ?
+        return;
+    }
+
+    try {
+        tpssrv.extend_tp_reservation(reservation_id, req.body);
+    } catch (error) {
+        logger.error(error);
+        res.status(500).send({message: 'Error while extending tp reservation'});
+        res.end();
+        return;
+    }
+
+    res.status(200).send({message: 'Reservation extended'});  // Why do none of the other routes give a 200 status on success ?
+    res.end();
+});
+
 module.exports = router;