better organization

src/app.py

@@ -9,10 +9,10 @@ import sentry_sdk
 from sentry_sdk.integrations.flask import FlaskIntegration
 from healthcheck import HealthCheck
 
-from marshm import ma
+from flaskaddons.marshm import ma
-from fred import flaskred
+from flaskaddons.fred import flaskred
-from config import SENTRY_DSN, RELEASEMODE, RELEASE_ID, PORT, DEBUG, REDIS_URL, ALLOWED_ORIGINS
+from utils.config import SENTRY_DSN, RELEASEMODE, RELEASE_ID, PORT, DEBUG, REDIS_URL, ALLOWED_ORIGINS
-from errorhandlers import register_all_error_handlers
+from utils.errorhandlers import register_all_error_handlers
 from resources import LoginApi, ListsApi, MeApi, SingleListApi, ItemApi
 
 """

src/flaskaddons/__init__.py

@@ -0,0 +1,2 @@
+from .fred import flaskred
+from .marshm import ma

src/resources.py

@@ -1,300 +0,0 @@
-#!/usr/bin/env python3
-
-import uuid
-
-from flask_restful import Resource
-from flask import request, current_app, abort
-import musicbrainzngs
-import spotipy
-from spotipy.oauth2 import SpotifyClientCredentials
-
-from fred import flaskred
-from config import ENCODED_SECRET_KEY, SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET
-from schemas import UserSchema
-from aes_encrypt import EncryptedUserRedis
-
-"""
-Flask Restful endpoints
-"""
-
-__author__ = '@tormakris'
-__copyright__ = "Copyright 2020, onSpot Team"
-__module_name__ = "resources"
-__version__text__ = "1"
-
-INVALID_JSON_SCHEMA_MSG = "invalid json schema"
-
-
-class UserStoreResource(Resource):
-    encryptor = EncryptedUserRedis(ENCODED_SECRET_KEY)
-
-
-class SpotifyUserStoreResource(UserStoreResource):
-    spotify = spotipy.Spotify(auth_manager=SpotifyClientCredentials(client_id=SPOTIFY_CLIENT_ID,
-                                                                    client_secret=SPOTIFY_CLIENT_SECRET))
-
-
-class LoginApi(UserStoreResource):
-    userschema = UserSchema(many=False)
-
-    def post(self):
-        """
-         See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/logon
-        """
-        body = request.get_json()
-
-        try:
-            userobj = self.userschema.load(body)
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(417, INVALID_JSON_SCHEMA_MSG)
-
-        try:
-            musicbrainzngs.auth(userobj['name'], userobj['password'])
-            musicbrainzngs.get_collections()
-            musicbrainzngs.auth(None, None)
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(401, "login denied to musicbrainz")
-
-        self.encryptor.store(body)
-        token = str(uuid.uuid4())
-        flaskred.set(token, userobj['name'].encode('UTF-8'))
-
-        return {
-                   'token': token
-               }, 200
-
-    def delete(self):
-        """
-         See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/logoff
-        """
-        try:
-            flaskred.delete(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
-            flaskred.delete(request.headers.get('Authorization'))
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(401, "unauthorized")
-
-        return "", 204
-
-
-class MeApi(Resource):
-    """
-    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/currentUser
-    """
-
-    def get(self):
-        try:
-            currusername = flaskred.get(request.headers.get('Authorization')).decode('UTF-8')
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(401, "unauthorized")
-        return {"name": currusername}, 200
-
-
-class ListsApi(UserStoreResource):
-    """
-    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getAllLists
-    """
-
-    def get(self):
-        try:
-            currcreds = self.encryptor.load(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(401, "unauthorized")
-
-        musicbrainzngs.auth(currcreds['name'], currcreds['password'])
-        collections = musicbrainzngs.get_collections()
-        musicbrainzngs.auth(None, None)
-        elementlist = []
-        for collection in collections['collection-list']:
-            if collection['entity-type'] == 'release':
-                count = collection['release-count']
-            elif collection['entity-type'] == 'artist':
-                count = collection['artist-count']
-            elif collection['entity-type'] == 'work':
-                count = collection['work-count']
-            elif collection['entity-type'] == 'recording':
-                count = collection['recording-count']
-            else:
-                continue
-            flaskred.set(collection['id'], collection['entity-type'].encode('UTF-8'))
-            elementlist.append({"id": collection['id'], "name": collection['name'], "element_count": count,
-                                "type": collection['entity-type']})
-        returndict = {"count": collections['collection-count'],
-                      "ids": elementlist}
-
-        return returndict, 200
-
-
-class SingleListApi(SpotifyUserStoreResource):
-    """
-    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getList
-    """
-
-    def get(self, listid: str):
-        try:
-            currcreds = self.encryptor.load(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(401, "unauthorized")
-        try:
-            list_type = flaskred.get(listid).decode('UTF-8')
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(404, "unknown list")
-        musicbrainzngs.auth(currcreds['name'], currcreds['password'])
-        limit = int(request.args.get('limit', 10))
-        offset = int(request.args.get('offset', 0))
-        if list_type == 'release':
-            currdata = musicbrainzngs.get_releases_in_collection(listid, limit, offset)['collection']
-            releaselist = []
-            for release in currdata['release-list']:
-                releasedata = {"id": release['id'], "album": release['title']}
-                currrelease = musicbrainzngs.get_release_by_id(release['id'], includes=['artists'])
-                album_spot = self.spotify.search(q=release['title'], type="album", limit=1)['albums']['items']
-                if len(album_spot) > 0:
-                    releasedata['spotify_id'] = f"spotify:album:{album_spot[0]['id']}"
-                if 'artist-credit' in currrelease['release'] and currrelease['release']['artist-credit']:
-                    currartist = currrelease['release']['artist-credit'][0]['artist']
-                    releasedata['artist'] = currartist['name']
-                try:
-                    imgurl = musicbrainzngs.get_image_list(release['id'])['images']
-                    if len(imgurl) > 0:
-                        releasedata['cover_url'] = imgurl[0]['image']
-                except Exception as e:
-                    current_app.logger.warning(e)
-                releaselist.append(releasedata)
-                flaskred.set(release['id'], 'release'.encode('UTF-8'))
-            retdata = {"id": currdata['id'], "element_count": currdata['release-count'], "itemlist": releaselist}
-        elif list_type == 'artist':
-            currdata = musicbrainzngs.get_artists_in_collection(listid, limit, offset)['collection']
-            artistlist = []
-            for artist in currdata['artist-list']:
-                artist_data = {"id": artist['id'], "artist": artist['name']}
-                artist_spot = self.spotify.search(q=artist['name'], type="artist", limit=1)['artists']['items']
-                if len(artist_spot) > 0:
-                    artist_data['spotify_id'] = f"spotify:artist:{artist_spot[0]['id']}"
-                    artist_image = artist_spot[0]['images']
-                    if len(artist_image) > 0:
-                        artist_data['cover_url'] = artist_image[0]['url']
-                artistlist.append(artist_data)
-            flaskred.set(artist['id'], 'artist'.encode('UTF-8'))
-            retdata = {"id": currdata['id'], "element_count": currdata['artist-count'], "itemlist": artistlist}
-        elif list_type == 'work':
-            currdata = musicbrainzngs.get_works_in_collection(listid, limit, offset)['collection']
-            worklist = []
-            for work in currdata['work-list']:
-                workdata = {"id": work['id'], "title": work['title']}
-                work_spot = self.spotify.search(q=work['title'], type="track", limit=1)['tracks']['items']
-                if len(work_spot) > 0:
-                    workdata['spotify_id'] = f"spotify:track:{work_spot[0]['id']}"
-                worklist.append(workdata)
-                flaskred.set(work['id'], 'recording'.encode('UTF-8'))
-            retdata = {"id": currdata['id'], "element_count": currdata['work-count'], "itemlist": worklist}
-        elif list_type == 'recording':
-            currdata = musicbrainzngs.get_recordings_in_collection(listid, limit, offset)['collection']
-            recordinglist = []
-            for recording in currdata['recording-list']:
-                currrec = {"id": recording['id'], "title": recording['title']}
-                currrecording = musicbrainzngs.get_recording_by_id(recording['id'], includes=['artists', 'releases'])
-                if 'artist-credit' in currrecording['recording'] and currrecording['recording']['artist-credit']:
-                    currartist = currrecording['recording']['artist-credit'][0]['artist']
-                    currrec['artist'] = currartist['name']
-                if 'release-list' in currrecording['recording'] and currrecording['recording']['release-list']:
-                    currrlease = currrecording['recording']['release-list'][0]
-                    currrec['album'] = currrlease['title']
-                    try:
-                        imgurl = musicbrainzngs.get_image_list(recording['id'])['images']
-                        if len(imgurl) > 0:
-                            currrec['cover_url'] = imgurl[0]['image']
-                    except Exception as e:
-                        current_app.logger.warning(e)
-                recording_spot = self.spotify.search(q=recording['title'], type="track", limit=1)['tracks']['items']
-                if len(recording_spot) > 0:
-                    currrec['spotify_id'] = f"spotify:track:{recording_spot[0]['id']}"
-                recordinglist.append(currrec)
-                flaskred.set(recording['id'], 'recording'.encode('UTF-8'))
-            retdata = {"id": currdata['id'], "element_count": currdata['recording-count'], "itemlist": recordinglist}
-        else:
-            abort(417, "wrong type of collection")
-        musicbrainzngs.auth(None, None)
-        retdata['type'] = list_type
-        retdata['name'] = currdata['name']
-        return retdata, 200
-
-
-class ItemApi(SpotifyUserStoreResource):
-    """
-    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getItem
-    """
-
-    def get(self, itemid: str):
-        try:
-            flaskred.get(request.headers.get('Authorization')).decode('UTF-8')
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(401, "unauthorized")
-        try:
-            item_type = flaskred.get(itemid).decode('UTF-8')
-        except Exception as e:
-            current_app.logger.warning(e)
-            abort(404, "unknown item")
-
-        if item_type == 'release':
-            currrelease = musicbrainzngs.get_release_by_id(itemid, includes=['artists'])['release']
-            album_spot = self.spotify.search(q=currrelease['title'], type="album", limit=1)['albums']['items']
-            retdata = {"id": itemid, "album": currrelease['title']}
-            try:
-                imgurl = musicbrainzngs.get_image_list(currrelease['id'])['images']
-                if len(imgurl) > 0:
-                    retdata['cover_url'] = imgurl[0]['image']
-            except Exception as e:
-                current_app.logger.warning(e)
-            if len(album_spot) > 0:
-                retdata['spotify_id'] = f"spotify:album:{album_spot[0]['id']}"
-            if 'artist-credit' in currrelease and currrelease['artist-credit']:
-                retdata['artist'] = currrelease['artist-credit'][0]['artist']['name']
-        elif item_type == 'artist':
-            currartist = musicbrainzngs.get_artist_by_id(itemid)['artist']
-            artist_spot = self.spotify.search(q=currartist['name'], type="artist", limit=1)['artists']['items']
-            retdata = {"id": itemid, "artist": currartist['name']}
-            if len(artist_spot) > 0:
-                retdata['spotify_id'] = f"spotify:artist:{artist_spot[0]['id']}"
-                artist_image = artist_spot[0]['images']
-                if len(artist_image) > 0:
-                    retdata['cover_url'] = artist_image[0]['url']
-        elif item_type == 'work':
-            currwork = musicbrainzngs.get_work_by_id(itemid)['work']
-            work_spot = self.spotify.search(q=currwork['title'], type="track", limit=1)['tracks']['items']
-            retdata = {"id": itemid, "title": currwork['title']}
-            if len(work_spot) > 0:
-                retdata['spotify_id'] = f"spotify:track:{work_spot[0]['id']}"
-                work_image = work_spot[0]['images']
-                if len(work_image) > 0:
-                    retdata['cover_url'] = work_image[0]['url']
-        elif item_type == 'recording':
-            currrecording = musicbrainzngs.get_recording_by_id(itemid, includes=['artists', 'releases'])['recording']
-            recording_spot = self.spotify.search(q=currrecording['title'], type="track", limit=1)['tracks']['items']
-            retdata = {"id": itemid, "title": currrecording['title']}
-            if 'artist-credit' in currrecording and currrecording['artist-credit']:
-                currartist = currrecording['artist-credit'][0]['artist']
-                retdata['artist'] = currartist['name']
-            if 'release-list' in currrecording and currrecording['release-list']:
-                currrlease = currrecording['release-list'][0]
-                retdata['album'] = currrlease['title']
-                try:
-                    imgurl = musicbrainzngs.get_image_list(currrlease['id'])['images']
-                    if len(imgurl) > 0:
-                        retdata['cover_url'] = imgurl[0]['image']
-                except Exception as e:
-                    current_app.logger.warning(e)
-            if len(recording_spot) > 0:
-                retdata['spotify_id'] = f"spotify:track:{recording_spot[0]['id']}"
-        else:
-            abort(417, "wrong type of item")
-
-        retdata['type'] = item_type
-        return retdata, 200

src/resources/__init__.py

@@ -0,0 +1,5 @@
+from .meapi import MeApi
+from .singlelistapi import SingleListApi
+from .listsapi import ListsApi
+from .loginapi import LoginApi
+from .itemapi import ItemApi

src/resources/itemapi.py

@@ -0,0 +1,88 @@
+"""
+Endpoinds manipulating items
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "itemapi"
+__version__text__ = "1"
+
+import musicbrainzngs
+from flask import request, current_app, abort
+
+from flaskaddons.fred import flaskred
+from resources.spotifyuserstoreresource import SpotifyUserStoreResource
+
+
+class ItemApi(SpotifyUserStoreResource):
+    """
+    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getItem
+    """
+
+    def get(self, itemid: str):
+        try:
+            flaskred.get(request.headers.get('Authorization')).decode('UTF-8')
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(401, "unauthorized")
+        try:
+            item_type = flaskred.get(itemid).decode('UTF-8')
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(404, "unknown item")
+
+        if item_type == 'release':
+            currrelease = musicbrainzngs.get_release_by_id(itemid, includes=['artists'])['release']
+            album_spot = self.spotify.search(q=currrelease['title'], type="album", limit=1)['albums']['items']
+            retdata = {"id": itemid, "album": currrelease['title']}
+            try:
+                imgurl = musicbrainzngs.get_image_list(currrelease['id'])['images']
+                if len(imgurl) > 0:
+                    retdata['cover_url'] = imgurl[0]['image']
+            except Exception as e:
+                current_app.logger.warning(e)
+            if len(album_spot) > 0:
+                retdata['spotify_id'] = f"spotify:album:{album_spot[0]['id']}"
+            if 'artist-credit' in currrelease and currrelease['artist-credit']:
+                retdata['artist'] = currrelease['artist-credit'][0]['artist']['name']
+        elif item_type == 'artist':
+            currartist = musicbrainzngs.get_artist_by_id(itemid)['artist']
+            artist_spot = self.spotify.search(q=currartist['name'], type="artist", limit=1)['artists']['items']
+            retdata = {"id": itemid, "artist": currartist['name']}
+            if len(artist_spot) > 0:
+                retdata['spotify_id'] = f"spotify:artist:{artist_spot[0]['id']}"
+                artist_image = artist_spot[0]['images']
+                if len(artist_image) > 0:
+                    retdata['cover_url'] = artist_image[0]['url']
+        elif item_type == 'work':
+            currwork = musicbrainzngs.get_work_by_id(itemid)['work']
+            work_spot = self.spotify.search(q=currwork['title'], type="track", limit=1)['tracks']['items']
+            retdata = {"id": itemid, "title": currwork['title']}
+            if len(work_spot) > 0:
+                retdata['spotify_id'] = f"spotify:track:{work_spot[0]['id']}"
+                work_image = work_spot[0]['images']
+                if len(work_image) > 0:
+                    retdata['cover_url'] = work_image[0]['url']
+        elif item_type == 'recording':
+            currrecording = musicbrainzngs.get_recording_by_id(itemid, includes=['artists', 'releases'])['recording']
+            recording_spot = self.spotify.search(q=currrecording['title'], type="track", limit=1)['tracks']['items']
+            retdata = {"id": itemid, "title": currrecording['title']}
+            if 'artist-credit' in currrecording and currrecording['artist-credit']:
+                currartist = currrecording['artist-credit'][0]['artist']
+                retdata['artist'] = currartist['name']
+            if 'release-list' in currrecording and currrecording['release-list']:
+                currrlease = currrecording['release-list'][0]
+                retdata['album'] = currrlease['title']
+                try:
+                    imgurl = musicbrainzngs.get_image_list(currrlease['id'])['images']
+                    if len(imgurl) > 0:
+                        retdata['cover_url'] = imgurl[0]['image']
+                except Exception as e:
+                    current_app.logger.warning(e)
+            if len(recording_spot) > 0:
+                retdata['spotify_id'] = f"spotify:track:{recording_spot[0]['id']}"
+        else:
+            abort(417, "wrong type of item")
+
+        retdata['type'] = item_type
+        return retdata, 200

src/resources/listsapi.py

@@ -0,0 +1,50 @@
+"""
+Endpoinds manipulating all lists
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "listsapi"
+__version__text__ = "1"
+
+import musicbrainzngs
+from flask import current_app, abort, request
+
+from flaskaddons.fred import flaskred
+from resources.userstoreresource import UserStoreResource
+
+
+class ListsApi(UserStoreResource):
+    """
+    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getAllLists
+    """
+
+    def get(self):
+        try:
+            currcreds = self.encryptor.load(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(401, "unauthorized")
+
+        musicbrainzngs.auth(currcreds['name'], currcreds['password'])
+        collections = musicbrainzngs.get_collections()
+        musicbrainzngs.auth(None, None)
+        elementlist = []
+        for collection in collections['collection-list']:
+            if collection['entity-type'] == 'release':
+                count = collection['release-count']
+            elif collection['entity-type'] == 'artist':
+                count = collection['artist-count']
+            elif collection['entity-type'] == 'work':
+                count = collection['work-count']
+            elif collection['entity-type'] == 'recording':
+                count = collection['recording-count']
+            else:
+                continue
+            flaskred.set(collection['id'], collection['entity-type'].encode('UTF-8'))
+            elementlist.append({"id": collection['id'], "name": collection['name'], "element_count": count,
+                                "type": collection['entity-type']})
+        returndict = {"count": collections['collection-count'],
+                      "ids": elementlist}
+
+        return returndict, 200

src/resources/loginapi.py

@@ -0,0 +1,62 @@
+"""
+Authentication api
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "loginapi"
+__version__text__ = "1"
+
+import uuid
+
+import musicbrainzngs
+from flask import request, current_app, abort
+
+from flaskaddons.fred import flaskred
+from resources.userstoreresource import UserStoreResource
+from schemas.userschema import UserSchema
+
+
+class LoginApi(UserStoreResource):
+    userschema = UserSchema(many=False)
+
+    def post(self):
+        """
+         See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/logon
+        """
+        body = request.get_json()
+
+        try:
+            userobj = self.userschema.load(body)
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(417, "invalid json schema")
+
+        try:
+            musicbrainzngs.auth(userobj['name'], userobj['password'])
+            musicbrainzngs.get_collections()
+            musicbrainzngs.auth(None, None)
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(401, "login denied to musicbrainz")
+
+        self.encryptor.store(body)
+        token = str(uuid.uuid4())
+        flaskred.set(token, userobj['name'].encode('UTF-8'))
+
+        return {
+                   'token': token
+               }, 200
+
+    def delete(self):
+        """
+         See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/logoff
+        """
+        try:
+            flaskred.delete(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
+            flaskred.delete(request.headers.get('Authorization'))
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(401, "unauthorized")
+
+        return "", 204

src/resources/meapi.py

@@ -0,0 +1,27 @@
+"""
+Endpoinds to help user determine identity
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "meapi"
+__version__text__ = "1"
+
+from flask import request, current_app, abort
+from flask_restful import Resource
+
+from flaskaddons.fred import flaskred
+
+
+class MeApi(Resource):
+    """
+    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/currentUser
+    """
+
+    def get(self):
+        try:
+            currusername = flaskred.get(request.headers.get('Authorization')).decode('UTF-8')
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(401, "unauthorized")
+        return {"name": currusername}, 200

src/resources/singlelistapi.py

@@ -0,0 +1,111 @@
+"""
+Endpoinds manipulating single lists
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "singlelistapi"
+__version__text__ = "1"
+
+import musicbrainzngs
+from flask import request, current_app, abort
+
+from flaskaddons.fred import flaskred
+from resources.spotifyuserstoreresource import SpotifyUserStoreResource
+
+
+class SingleListApi(SpotifyUserStoreResource):
+    """
+    See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getList
+    """
+
+    def get(self, listid: str):
+        try:
+            currcreds = self.encryptor.load(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(401, "unauthorized")
+        try:
+            list_type = flaskred.get(listid).decode('UTF-8')
+        except Exception as e:
+            current_app.logger.warning(e)
+            abort(404, "unknown list")
+        musicbrainzngs.auth(currcreds['name'], currcreds['password'])
+        limit = int(request.args.get('limit', 10))
+        offset = int(request.args.get('offset', 0))
+        if list_type == 'release':
+            currdata = musicbrainzngs.get_releases_in_collection(listid, limit, offset)['collection']
+            releaselist = []
+            for release in currdata['release-list']:
+                releasedata = {"id": release['id'], "album": release['title']}
+                currrelease = musicbrainzngs.get_release_by_id(release['id'], includes=['artists'])
+                album_spot = self.spotify.search(q=release['title'], type="album", limit=1)['albums']['items']
+                if len(album_spot) > 0:
+                    releasedata['spotify_id'] = f"spotify:album:{album_spot[0]['id']}"
+                if 'artist-credit' in currrelease['release'] and currrelease['release']['artist-credit']:
+                    currartist = currrelease['release']['artist-credit'][0]['artist']
+                    releasedata['artist'] = currartist['name']
+                try:
+                    imgurl = musicbrainzngs.get_image_list(release['id'])['images']
+                    if len(imgurl) > 0:
+                        releasedata['cover_url'] = imgurl[0]['image']
+                except Exception as e:
+                    current_app.logger.warning(e)
+                releaselist.append(releasedata)
+                flaskred.set(release['id'], 'release'.encode('UTF-8'))
+            retdata = {"id": currdata['id'], "element_count": currdata['release-count'], "itemlist": releaselist}
+        elif list_type == 'artist':
+            currdata = musicbrainzngs.get_artists_in_collection(listid, limit, offset)['collection']
+            artistlist = []
+            for artist in currdata['artist-list']:
+                artist_data = {"id": artist['id'], "artist": artist['name']}
+                artist_spot = self.spotify.search(q=artist['name'], type="artist", limit=1)['artists']['items']
+                if len(artist_spot) > 0:
+                    artist_data['spotify_id'] = f"spotify:artist:{artist_spot[0]['id']}"
+                    artist_image = artist_spot[0]['images']
+                    if len(artist_image) > 0:
+                        artist_data['cover_url'] = artist_image[0]['url']
+                artistlist.append(artist_data)
+            flaskred.set(artist['id'], 'artist'.encode('UTF-8'))
+            retdata = {"id": currdata['id'], "element_count": currdata['artist-count'], "itemlist": artistlist}
+        elif list_type == 'work':
+            currdata = musicbrainzngs.get_works_in_collection(listid, limit, offset)['collection']
+            worklist = []
+            for work in currdata['work-list']:
+                workdata = {"id": work['id'], "title": work['title']}
+                work_spot = self.spotify.search(q=work['title'], type="track", limit=1)['tracks']['items']
+                if len(work_spot) > 0:
+                    workdata['spotify_id'] = f"spotify:track:{work_spot[0]['id']}"
+                worklist.append(workdata)
+                flaskred.set(work['id'], 'recording'.encode('UTF-8'))
+            retdata = {"id": currdata['id'], "element_count": currdata['work-count'], "itemlist": worklist}
+        elif list_type == 'recording':
+            currdata = musicbrainzngs.get_recordings_in_collection(listid, limit, offset)['collection']
+            recordinglist = []
+            for recording in currdata['recording-list']:
+                currrec = {"id": recording['id'], "title": recording['title']}
+                currrecording = musicbrainzngs.get_recording_by_id(recording['id'], includes=['artists', 'releases'])
+                if 'artist-credit' in currrecording['recording'] and currrecording['recording']['artist-credit']:
+                    currartist = currrecording['recording']['artist-credit'][0]['artist']
+                    currrec['artist'] = currartist['name']
+                if 'release-list' in currrecording['recording'] and currrecording['recording']['release-list']:
+                    currrlease = currrecording['recording']['release-list'][0]
+                    currrec['album'] = currrlease['title']
+                    try:
+                        imgurl = musicbrainzngs.get_image_list(recording['id'])['images']
+                        if len(imgurl) > 0:
+                            currrec['cover_url'] = imgurl[0]['image']
+                    except Exception as e:
+                        current_app.logger.warning(e)
+                recording_spot = self.spotify.search(q=recording['title'], type="track", limit=1)['tracks']['items']
+                if len(recording_spot) > 0:
+                    currrec['spotify_id'] = f"spotify:track:{recording_spot[0]['id']}"
+                recordinglist.append(currrec)
+                flaskred.set(recording['id'], 'recording'.encode('UTF-8'))
+            retdata = {"id": currdata['id'], "element_count": currdata['recording-count'], "itemlist": recordinglist}
+        else:
+            abort(417, "wrong type of collection")
+        musicbrainzngs.auth(None, None)
+        retdata['type'] = list_type
+        retdata['name'] = currdata['name']
+        return retdata, 200

src/resources/spotifyuserstoreresource.py

@@ -0,0 +1,19 @@
+"""
+Base resource with user handling and Spotify integration
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "spotifyuserstoreresource"
+__version__text__ = "1"
+
+from spotipy.oauth2 import SpotifyClientCredentials
+import spotipy
+
+from resources.userstoreresource import UserStoreResource
+from utils.config import SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET
+
+
+class SpotifyUserStoreResource(UserStoreResource):
+    spotify = spotipy.Spotify(auth_manager=SpotifyClientCredentials(client_id=SPOTIFY_CLIENT_ID,
+                                                                    client_secret=SPOTIFY_CLIENT_SECRET))

src/resources/userstoreresource.py

@@ -0,0 +1,17 @@
+"""
+Base resource with user handling
+"""
+
+__author__ = '@tormakris'
+__copyright__ = "Copyright 2020, onSpot Team"
+__module_name__ = "userstoreresource"
+__version__text__ = "1"
+
+from flask_restful import Resource
+
+from utils.aes_encrypt import EncryptedUserRedis
+from utils.config import ENCODED_SECRET_KEY
+
+
+class UserStoreResource(Resource):
+    encryptor = EncryptedUserRedis(ENCODED_SECRET_KEY)

src/schemas/__init__.py

@@ -0,0 +1 @@
+from .userschema import UserSchema

src/schemas/userschema.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
-from marshm import ma
+from flaskaddons.marshm import ma
 from marshmallow import fields
 
 
 """
-Marshmallow schemas
+User Masrshmallow schema
 """
 
 __author__ = "@tormakris"
 __copyright__ = "Copyright 2020, onSpot Team"
-__module_name__ = "schemas"
+__module_name__ = "userschema"
 __version__text__ = "1"
 
 

src/utils/__init__.py

@@ -0,0 +1 @@
+from .aes_encrypt import AESCrypto

src/utils/aes_encrypt.py

@@ -14,7 +14,7 @@ import pickle
 
 from Crypto.Cipher import AES
 
-from fred import flaskred
+from flaskaddons.fred import flaskred
 
 
 class AESCrypto: