weko#48601, 48603 Fix workflow activity issue

modules/weko-items-ui/weko_items_ui/utils.py

@@ -42,7 +42,7 @@
     url_for,jsonify
 from flask_babelex import gettext as _
 from flask_login import current_user
-from invenio_accounts.models import Role, userrole
+from invenio_accounts.models import Role, User, userrole
 from invenio_db import db
 from invenio_i18n.ext import current_i18n
 from invenio_indexer.api import RecordIndexer
@@ -51,7 +51,6 @@
 from invenio_pidstore.models import PersistentIdentifier, PIDStatus
 from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_records.api import RecordBase
-from invenio_accounts.models import User
 from invenio_search import RecordsSearch
 from invenio_stats.utils import QueryRankingHelper, QuerySearchReportHelper
 from invenio_stats.views import QueryRecordViewCount as _QueryRecordViewCount
@@ -156,21 +155,12 @@ def get_user_info_by_username(username):
         user = UserProfile.get_by_username(username)
         user_id = user.user_id
 
-        metadata = MetaData()
-        metadata.reflect(bind=db.engine)
-        table_name = 'accounts_user'
-
-        user_table = Table(table_name, metadata)
-        record = db.session.query(user_table)
-
-        data = record.all()
-
-        for item in data:
-            if item[0] == user_id:
-                result['username'] = username
-                result['user_id'] = user_id
-                result['email'] = item[1]
-                return result
+        data = User.query.filter(User.id == user_id).first()
+        if data:
+            result['username'] = username
+            result['user_id'] = user_id
+            result['email'] = data.email
+            return result
         return None
     except Exception as e:
         result['error'] = str(e)
@@ -201,19 +191,9 @@ def validate_user(username, email):
         user = UserProfile.get_by_username(username)
         user_id = 0
 
-        metadata = MetaData()
-        metadata.reflect(bind=db.engine)
-        table_name = 'accounts_user'
-
-        user_table = Table(table_name, metadata)
-        record = db.session.query(user_table)
-
-        data = record.all()
-
-        for item in data:
-            if item[1] == email:
-                user_id = item[0]
-                break
+        data = User.query.filter(User.email == email).first()
+        if data:
+            user_id = data.id
 
         if user.user_id == user_id:
             user_info = dict()
@@ -243,24 +223,16 @@ def get_user_info_by_email(email):
     """
     result = dict()
     try:
-        metadata = MetaData()
-        metadata.reflect(bind=db.engine)
-        table_name = 'accounts_user'
-
-        user_table = Table(table_name, metadata)
-        record = db.session.query(user_table)
-
-        data = record.all()
-        for item in data:
-            if item[1] == email:
-                user = UserProfile.get_by_userid(item[0])
-                if user is None:
-                    result['username'] = ""
-                else:
-                    result['username'] = user.get_username
-                result['user_id'] = item[0]
-                result['email'] = email
-                return result
+        data = User.query.filter(User.email == email).first()
+        if data:
+            user = UserProfile.get_by_userid(data.id)
+            if user is None:
+                result['username'] = ""
+            else:
+                result['username'] = user.get_username
+            result['user_id'] = data.id
+            result['email'] = email
+            return result
         return None
     except Exception as e:
         result['error'] = str(e)
@@ -288,19 +260,9 @@ def get_user_information(user_id):
         result['username'] = user_info.get_username
         result['fullname'] = user_info.fullname
 
-    metadata = MetaData()
-    metadata.reflect(bind=db.engine)
-    table_name = 'accounts_user'
-
-    user_table = Table(table_name, metadata)
-    record = db.session.query(user_table)
-
-    data = record.all()
-
-    for item in data:
-        if item[0] == user_id:
-            result['email'] = item[1]
-            return result
+    data = User.query.filter(User.id == user_id).first()
+    if data:
+        result['email'] = data.email
 
     return result
 

modules/weko-workflow/tests/conftest.py

@@ -700,14 +700,14 @@ def users(app, db):
             ActionRoles(action='files-rest-object-delete-version', role=repoadmin_role),
             ActionRoles(action='files-rest-object-read', role=repoadmin_role),
             ActionRoles(action='search-access', role=repoadmin_role),
-            ActionRoles(action='detail-page-acces', role=repoadmin_role),
+            ActionRoles(action='detail-page-access', role=repoadmin_role),
             ActionRoles(action='download-original-pdf-access', role=repoadmin_role),
             ActionRoles(action='author-access', role=repoadmin_role),
             ActionRoles(action='items-autofill', role=repoadmin_role),
             ActionRoles(action='stats-api-access', role=repoadmin_role),
             ActionRoles(action='read-style-action', role=repoadmin_role),
             ActionRoles(action='update-style-action', role=repoadmin_role),
-            ActionRoles(action='detail-page-acces', role=repoadmin_role),
+            ActionRoles(action='detail-page-access', role=repoadmin_role),
 
             ActionRoles(action='admin-access', role=comadmin_role),
             ActionRoles(action='index-tree-access', role=comadmin_role),
@@ -718,33 +718,33 @@ def users(app, db):
             ActionRoles(action='files-rest-object-delete-version', role=comadmin_role),
             ActionRoles(action='files-rest-object-read', role=comadmin_role),
             ActionRoles(action='search-access', role=comadmin_role),
-            ActionRoles(action='detail-page-acces', role=comadmin_role),
+            ActionRoles(action='detail-page-access', role=comadmin_role),
             ActionRoles(action='download-original-pdf-access', role=comadmin_role),
             ActionRoles(action='author-access', role=comadmin_role),
             ActionRoles(action='items-autofill', role=comadmin_role),
-            ActionRoles(action='detail-page-acces', role=comadmin_role),
-            ActionRoles(action='detail-page-acces', role=comadmin_role),
+            ActionRoles(action='detail-page-access', role=comadmin_role),
+            ActionRoles(action='detail-page-access', role=comadmin_role),
 
             ActionRoles(action='item-access', role=contributor_role),
             ActionRoles(action='files-rest-bucket-update', role=contributor_role),
             ActionRoles(action='files-rest-object-delete', role=contributor_role),
             ActionRoles(action='files-rest-object-delete-version', role=contributor_role),
             ActionRoles(action='files-rest-object-read', role=contributor_role),
             ActionRoles(action='search-access', role=contributor_role),
-            ActionRoles(action='detail-page-acces', role=contributor_role),
+            ActionRoles(action='detail-page-access', role=contributor_role),
             ActionRoles(action='download-original-pdf-access', role=contributor_role),
             ActionRoles(action='author-access', role=contributor_role),
             ActionRoles(action='items-autofill', role=contributor_role),
-            ActionRoles(action='detail-page-acces', role=contributor_role),
-            ActionRoles(action='detail-page-acces', role=contributor_role),
+            ActionRoles(action='detail-page-access', role=contributor_role),
+            ActionRoles(action='detail-page-access', role=contributor_role),
         ]
         db.session.add_all(action_roles)
     db.session.commit()
     index = Index()
     db.session.add(index)
     db.session.commit()
-    comm = Community.create(community_id="comm01", role_id=sysadmin_role.id,
-                            id_user=sysadmin.id, title="test community",
+    comm = Community.create(community_id="comm01", role_id=comadmin_role.id,
+                            id_user=comadmin.id, title="test community",
                             description=("this is test community"),
                             root_node_id=index.id)
     db.session.commit()