Extended projects (#612)

* add last_extended project attribute

* implement last_extended

* fix

* Update CHANGELOG.md

---------

Co-authored-by: mboudet <mateo.boudet@gmail.com>

Author: rsiminel

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Ensure emails have name, destination and subject
 * Fix bug in TP account deletion
+* Adds a 'last_extended' attribute to the Project type
 * UI improvements on projects page
 * Fix database creation validation confirmation email
 * Fix database creation request email title

core/project.service.js

@@ -22,6 +22,7 @@ exports.edit_project = edit_project;
 async function create_project(new_project, uuid, action_owner = 'auto') {
     logger.info('Create Project ' + new_project.id + ' uuid ' + uuid);
     new_project.created_at = new Date().getTime();
+    new_project.last_extended = new_project.created_at;
     if (!new_project.expire) {
         new_project.expire = new Date().getTime() + CONFIG.project.default_expire * day_time;
     }

manager2/src/app/admin/project/project.component.ts

@@ -146,7 +146,11 @@ export class ProjectComponent implements OnInit {
     }
 
     update_project() {
-        this.project.expire = new Date(this.project_expire).getTime();
+        let new_expire = new Date(this.project_expire).getTime();
+        if (new_expire != this.project.expire) {
+            this.project.last_extended = new Date().getTime();
+            this.project.expire = new_expire;
+        }
         this.project.group = this.config.project.enable_group ? this.project.group : '';
         this.projectsService.update(this.project.id, this.project).subscribe(
             (resp) => {

manager2/src/app/admin/projects/projects.component.ts

@@ -246,6 +246,9 @@ export class ProjectsComponent implements OnInit {
                     if (!projects[i].created_at) {
                         projects[i].created_at = parseInt(projects[i]['_id'].substring(0, 8), 16) * 1000;
                     }
+                    if (!projects[i].last_extended) {
+                        projects[i].last_extended = projects[i].created_at;
+                    }
                 }
                 this.projects = active_projects;
                 this.expired_projects = expired_projects;

manager2/src/app/admin/projects/projects.service.ts

@@ -27,6 +27,7 @@ export class Project {
     path: string;
     expire: number;
     created_at: number;
+    last_extended: number;
 
     constructor(
         _id: string = '', uuid: string = '', id: string = '',
@@ -37,16 +38,16 @@ export class Project {
         low_cpu: number = null, high_cpu: number = null,
         orga: string = '',  description: string = '',
         access: string =  'Group', path: string = '',
-        expire: number = 0, created_at: number = null
+        expire: number = 0, created_at: number = null,
+        last_extended: number = null
     ) {
         this._id = _id; this.uuid = uuid, this.id = id; this.owner = owner;
         this.managers = [...new Set([owner, ...managers])]; this.group = group; this.size = size;
         this.current_size = current_size; this.low_size = low_size; this.high_size = high_size;
         this.cpu = cpu; this.current_cpu = current_cpu; this.low_cpu = low_cpu; this.high_cpu = high_cpu;
         this.orga = orga; this.description = description; this.access = access; this.path = path;
-        this.expire = expire; this.created_at = created_at;
+        this.expire = expire; this.created_at = created_at; this.last_extended = last_extended;
     }
-
 }
 
 @Injectable({
@@ -70,7 +71,8 @@ export class ProjectsService {
             resp.orga || '', resp.description || '',
             resp.access || 'Group', resp.path || '',
             new Date(resp.expire).getTime() || 0,
-            new Date(resp.created_at).getTime() || null
+            new Date(resp.created_at).getTime() || null,
+            new Date(resp.last_extended).getTime() || null
         );
     }
 

routes/projects.js

@@ -299,6 +299,7 @@ router.post('/project/:id', async function (req, res) {
                 size: req.body.size,
                 cpu: req.body.cpu,
                 expire: req.body.expire,
+                last_extended: req.body.last_extended,
                 description: req.body.description,
                 access: req.body.access,
                 orga: req.body.orga,
@@ -658,7 +659,9 @@ router.get('/project/:id/extend', async function (req, res) {
 
     if (CONFIG.project && CONFIG.project.allow_extend) {
         let expiration = new Date().getTime() + 360 * 1000 * 60 * 60 * 24; // one year
-        await dbsrv.mongo_projects().updateOne({ id: project.id }, { $set: { expire: expiration } });
+        await dbsrv
+            .mongo_projects()
+            .updateOne({ id: project.id }, { $set: { expire: expiration, last_extended: new Date().getTime() } });
         return res.send({ message: 'validity period extended', expiration: expiration });
     }
     return;