Restructure corpora blueprint

app/blueprints/corpora/__init__.py

@@ -16,4 +16,4 @@ def before_request():
     pass
 
 
-from . import cli, files, followers, routes, json_routes
+from . import cli, files, followers, routes

app/blueprints/corpora/json_routes.py

@@ -1,64 +0,0 @@
-from datetime import datetime
-from flask import abort, request, url_for
-from flask_login import current_user
-from app import db
-from app.decorators import content_negotiation
-from app.models import Corpus, CorpusFollowerRole
-from . import bp
-from .decorators import corpus_follower_permission_required, corpus_owner_or_admin_required
-
-
-
-
-@bp.route('/<hashid:corpus_id>/generate-share-link', methods=['POST'])
-@corpus_follower_permission_required('MANAGE_FOLLOWERS')
-@content_negotiation(consumes='application/json', produces='application/json')
-def generate_corpus_share_link(corpus_id):
-    data = request.json
-    if not isinstance(data, dict):
-        abort(400)
-    expiration = data.get('expiration')
-    if not isinstance(expiration, str):
-        abort(400)
-    role_name = data.get('role')
-    if not isinstance(role_name, str):
-        abort(400)
-    expiration_date = datetime.strptime(expiration, '%b %d, %Y')
-    cfr = CorpusFollowerRole.query.filter_by(name=role_name).first()
-    if cfr is None:
-        abort(400)
-    corpus = Corpus.query.get_or_404(corpus_id)
-    token = current_user.generate_follow_corpus_token(corpus.hashid, role_name, expiration_date)
-    corpus_share_link = url_for(
-        'corpora.follow_corpus',
-        corpus_id=corpus_id,
-        token=token,
-        _external=True
-    )
-    response_data = {
-        'message': 'Corpus share link generated',
-        'category': 'corpus',
-        'corpusShareLink': corpus_share_link
-    }
-    return response_data, 200
-
-
-
-@bp.route('/<hashid:corpus_id>/is_public', methods=['PUT'])
-@corpus_owner_or_admin_required
-@content_negotiation(consumes='application/json', produces='application/json')
-def update_corpus_is_public(corpus_id):
-    is_public = request.json
-    if not isinstance(is_public, bool):
-        abort(400)
-    corpus = Corpus.query.get_or_404(corpus_id)
-    corpus.is_public = is_public
-    db.session.commit()
-    response_data = {
-        'message': (
-            f'Corpus "{corpus.title}" is now'
-            f' {"public" if is_public else "private"}'
-        ),
-        'category': 'corpus'
-    }
-    return response_data, 200

app/blueprints/corpora/routes.py

@@ -6,6 +6,7 @@ from flask import (
     Flask,
     jsonify,
     redirect,
+    request,
     render_template,
     url_for
 )
@@ -150,7 +151,7 @@ def delete_corpus(corpus_id: int):
     return jsonify(f'Corpus "{corpus.title}" marked for deletion.'), 202
 
 
-@bp.route('/<hashid:corpus_id>/build', methods=['PATCH'])
+@bp.route('/<hashid:corpus_id>/build', methods=['POST'])
 def build_corpus(corpus_id: int):
     corpus = Corpus.query.get_or_404(corpus_id)
 
@@ -178,11 +179,15 @@ def build_corpus(corpus_id: int):
     return jsonify(f'Corpus "{corpus.title}" marked for building.'), 202
 
 
-@bp.route('/<hashid:corpus_id>/generate-share-link', methods=['POST'])
-def create_share_link(corpus_id: int, expiration_date: str, role_name: str):
+@bp.route('/<hashid:corpus_id>/create-share-link', methods=['POST'])
+def create_share_link(corpus_id: int):
+    data = request.json
+
+    expiration_date = data['expiration_date']
     if not isinstance(expiration_date, str):
         abort(400)
 
+    role_name = data['role_name']
     if not isinstance(role_name, str):
         abort(400)
 
@@ -233,8 +238,9 @@ def analysis(corpus_id: int):
         title=f'Analyse Corpus {corpus.title}'
     )
 
+
 @bp.route('/<hashid:corpus_id>/analysis/stopwords')
-def get_stopwords():
+def get_stopwords(corpus_id: int):
         languages = [
             'german',
             'english',
@@ -270,3 +276,24 @@ def follow_corpus(corpus_id: int, token: str):
 
     flash(f'You are following "{corpus.title}" now', category='corpus')
     return redirect(corpus.url)
+
+
+@bp.route('/<hashid:corpus_id>/is-public', methods=['PUT'])
+def update_is_public(corpus_id):
+    new_value = request.json
+    if not isinstance(new_value, bool):
+        abort(400)
+
+    corpus = Corpus.query.get_or_404(corpus_id)
+
+    if not (
+        corpus.user == current_user
+        or current_user.is_administrator
+    ):
+        abort(403)
+
+
+    corpus.is_public = new_value
+    db.session.commit()
+
+    return jsonify(f'Corpus "{corpus.title}" is now {"public" if new_value else "private"}'), 200