Links were not saved when creating new person.

Makistos · Jun 12, 2024 · af80b1d · af80b1d
1 parent 784eb5e
commit af80b1d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/app/impl_people.py b/app/impl_people.py
@@ -462,7 +462,8 @@ def person_add(params: Any) -> ResponseType:
     person.image_src = data['image_src'] if 'image_src' in data else None
     person.dob = data['dob'] if 'dob' in data else None
     person.dod = data['dod'] if 'dod' in data else None
-    if 'nationality' in data and 'id' in data['nationality']:
+    if ('nationality' in data and data['nationality'] is not None
+            and 'id' in data['nationality']):
         person.nationality_id = data['nationality']['id']
     else:
         person.nationality_id = data['nationality_id'] \
@@ -477,6 +478,21 @@ def person_add(params: Any) -> ResponseType:
         return ResponseType('Tietokantavirhe.',
                             HttpResponseCode.INTERNAL_SERVER_ERROR.value)
 
+    if 'links' in data:
+        for link in data['links']:
+            pl = PersonLink(
+                person_id=person.id, link=link['link'],
+                description=link['description']
+            )
+            session.add(pl)
+    try:
+        session.add(person)
+        session.commit()
+    except SQLAlchemyError as exp:
+        app.logger.error('Exception in person_add: ' + str(exp))
+        return ResponseType('Tietokantavirhe.',
+                            HttpResponseCode.INTERNAL_SERVER_ERROR.value)
+
     return ResponseType(str(person.id), HttpResponseCode.CREATED.value)
 
 

diff --git a/app/impl_works.py b/app/impl_works.py
@@ -12,8 +12,8 @@
 from app.impl import (ResponseType, SearchResult,
                       SearchResultFields, searchscore, set_language, check_int,
                       get_join_changes)
-from app.orm_decl import (Edition, Genre, Part, Tag, Work, WorkType, WorkTag,
-                          WorkGenre, WorkLink, Bookseries, ShortStory,
+from app.orm_decl import (Edition, Genre, Part, Tag, Work, WorkType,
+                          WorkTag, WorkGenre, WorkLink, Bookseries, ShortStory,
                           Contributor)
 from app.model import (WorkBriefSchema, WorkTypeBriefSchema,
                        ShortBriefSchema)
@@ -524,17 +524,17 @@ def search_works_by_author(params: Dict[str, str]) -> ResponseType:
             .filter(Work.author_str.ilike(params['letter'] + '%'))\
             .order_by(Work.author_str).all()
     except SQLAlchemyError as exp:
-        app.logger.error('Exception in SearchWorksByAuthor: ' + str(exp))
-        return ResponseType(f'SearchWorksByAuthor: Tietokantavirhe. id={id}',
+        app.logger.error(exp)
+        return ResponseType('Tietokantavirhe',
                             HttpResponseCode.INTERNAL_SERVER_ERROR.value)
 
     try:
         # schema = WorkBriefSchema(many=True)
         schema = BookIndexSchema(many=True)
         retval = schema.dump(works)
     except exceptions.MarshmallowError as exp:
-        app.logger.error('SearchWorksByAuthor schema error: ' + str(exp))
-        return ResponseType('SearchWorksByAuthor: Skeemavirhe.',
+        app.logger.error(exp)
+        return ResponseType('Skeemavirhe.',
                             HttpResponseCode.INTERNAL_SERVER_ERROR.value)
 
     return ResponseType(retval, HttpResponseCode.OK.value)