[FEAT] Delete Node is move to trash first and must exectute empty_trash() on...

[FEAT] Delete Node is move to trash first and must exectute empty_trash() on the server ones per day.

gargantext_web/urls.py

@@ -33,12 +33,10 @@ urlpatterns = patterns('',
     # Project Management
     url(r'^projects/$', views.projects),
     url(r'^project/(\d+)/$', views_optimized.project),
-    url(r'^project/(\d+)/delete/$', views.delete_node), # => api.delete(children but not if copies...)
-    url(r'^delete/(\d+)$', views.delete_node), # => api.node('id' = id, children = 'True', copies = False)
+    url(r'^delete/(\d+)$', views.trash_node), # => api.node('id' = id, children = 'True', copies = False)
     
     # Corpus management
     url(r'^project/(\d+)/corpus/(\d+)/$', views.corpus),
-    url(r'^project/(\d+)/corpus/(\d+)/delete/$', views.delete_corpus),
     url(r'^project/(\d+)/corpus/(\d+)/corpus.csv$', views.corpus_csv),
     url(r'^project/(\d+)/corpus/(tests_mvc_listdocuments+)/corpus.tests_mvc_listdocuments$', views.corpus_csv),
     

gargantext_web/views.py

@@ -2,7 +2,7 @@ from django.shortcuts import redirect
 from django.shortcuts import render
 from django.db import transaction
 
-from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseForbidden
 from django.template.loader import get_template
 from django.template import Context
 
@@ -30,7 +30,8 @@ import os
 
 # SOME FUNCTIONS
 
-from gargantext_web.settings import DEBUG, STATIC_ROOT
+from gargantext_web import settings
+
 from django.http import *
 from django.shortcuts import render_to_response,redirect
 from django.template import RequestContext
@@ -441,6 +442,44 @@ def subcorpusJSON(request, project_id, corpus_id, start , end ):
     # return HttpResponse(html)
     return HttpResponse( serializer.data , content_type='application/json')
 
+
+def empty_trash():
+    nodes = models.Node.objects.filter(type_id=cache.NodeType['Trash'].id).all()
+    with transaction.atomic():
+        for node in nodes:
+            try:
+                node.children.delete()
+            except Exception as error:
+                print(error)
+
+            node.delete()
+
+
+def trash_node(request, node_id):
+    
+    # do we have a valid user?
+    user = request.user
+    node = session.query(Node).filter(Node.id == node_id).first()
+    
+    if not user.is_authenticated():
+        return redirect('/login/?next=%s' % request.path)
+    if node.user_id != user.id:
+        return HttpResponseForbidden()
+
+    previous_type_id = node.type_id
+    node.type_id = cache.NodeType['Trash'].id
+    session.add(node)
+    session.commit()
+    
+    if previous_type_id == cache.NodeType['Project'].id:
+        return HttpResponseRedirect('/projects/')
+    elif previous_type_id == cache.NodeType['Corpus'].id:
+        return HttpResponseRedirect('/project/' + str(session.query(Node.id).filter(Node.id==node.parent_id).first()[0]))
+
+    if settings.DEBUG == True:
+        empty_trash()
+
+
 def delete_node(request, node_id):
 
     #nodes = session.query(Node).filter(or_(Node.id == node_id, Node.parent_id == node_id)).all()
@@ -643,7 +682,6 @@ def send_csv(request, corpus_id):
 from gargantext_web.api import JsonHttpResponse
 from analysis.functions import get_cooc
 import json
-from gargantext_web.settings import MEDIA_ROOT
 def node_link(request, corpus_id):
     '''
     Create the HttpResponse object with the node_link dataset.
@@ -652,7 +690,7 @@ def node_link(request, corpus_id):
     data = []
     
     corpus = session.query(Node).filter(Node.id==corpus_id).first()
-    filename = MEDIA_ROOT + '/corpora/%s/%s_%s.json' % (request.user , corpus.parent_id, corpus_id)
+    filename = settings.MEDIA_ROOT + '/corpora/%s/%s_%s.json' % (request.user , corpus.parent_id, corpus_id)
     print("file exists?:",os.path.isfile(filename))
     if os.path.isfile(filename):
         json_data = open(filename,"r")

gargantext_web/views_optimized.py

@@ -52,6 +52,7 @@ def project(request, project_id):
         .outerjoin(Node_Resource, Node_Resource.node_id == Node.id)
         .outerjoin(Resource, Resource.id == Node_Resource.resource_id)
         .filter(Node.parent_id == project.id)
+        .filter(Node.type_id == cache.NodeType['Corpus'].id)
         .group_by(Node.id, Node.name, Resource.type_id)
         .order_by(Node.name)
     )

init/init.py

@@ -7,7 +7,8 @@
 #NodeType.objects.all().delete()
 
 
-from node.models import Node, NodeType, Project, Corpus, Document, Ngram, Node_Ngram, User, Language, ResourceType
+from node.models import *
+
 
 
 import pycountry
@@ -31,14 +32,8 @@ except:
     me = User(username='pksm3')
     me.save()
 
-
-try:
-    typeProject = NodeType.objects.get(name='Root')
-except Exception as error:
-    print(error)
-    typeProject = NodeType(name='Root')
-    typeProject.save()  
-
+for node_type in ['Trash', 'Root', ]:
+    NodeType.objects.get_or_create(name=node_type)
 
 try:
     typeProject = NodeType.objects.get(name='Project')

templates/corpus.html

@@ -44,7 +44,7 @@
 
 							<!--						<a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add file</a> -->
 						<a class="btn btn-primary btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/corpus.csv">Save as</a>
-						<a class="btn btn-primary btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/delete">Delete</a></p>
+						<a class="btn btn-primary btn-lg" role="button" href="/delete/{{ corpus.id }}">Delete</a></p>
 
 						{% if number == 0 %}
 						<a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p>

templates/project.html

@@ -93,7 +93,7 @@
 																		<ul>
 																		<li> Rename </li>
 																		<li> Add new documents </li>
-																		<li><a href="/project/{{ project.id }}/corpus/{{ corpus.id}}/delete">Delete</a></li>
+																		<li><a href="/delete/{{corpus.id}}">Delete</a></li>
 																		</ul>
 																		'>Manage</button>
 																</li>

templates/projects.html

@@ -44,7 +44,7 @@
 																		<ul>
 																		<li> Rename </li>
 																		<li> Add new corpus </li>
-																		<li><a href="/project/{{ project.id }}/delete">Delete</a></li>
+																		<li><a href="/delete/{{ project.id }}">Delete</a></li>
 																		</ul>
 																		'>Manage</button>
 

test_db.py

@@ -4,6 +4,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gargantext_web.settings")
 os.environ.setdefault("DJANGO_HSTORE_GLOBAL_REGISTER", "False")
 
 # database tools
+from node import models
 from gargantext_web.db import *
 from parsing.corpustools import *
 
@@ -11,7 +12,9 @@ from parsing.corpustools import *
 
 
 user = session.query(User).first()
+
 project = session.query(Node).filter(Node.name == 'A').first()
+
 corpus = Node(
     parent_id = project.id,
     name = 'Test 456',