Fontaneria (#82)

* Fontaneria

* Cosas que hacen cosas

* Allow other users to edit posts

* Cosas

Author: alejgh

release/docker-compose.yml

@@ -97,7 +97,7 @@ services:
     depends_on:
       - kafka
 
-  texttospeech:
+  texttospeechservice:
     build: ../src/texttospeechservice/
     container_name: texttospeechservice
     ports:
@@ -106,6 +106,8 @@ services:
       - kafka
     environment: 
       KAFKA_ENDPOINT: "kafka:9092"
+      KAFKA_ENDPOINT: "kafka:9092"
+      STATISTICS_SERVICE_ENDPOINT: "http://statisticsservice:5000/soapws/statistics?wsdl"
 
   usersservice:
     build: ../src/usersservice/
@@ -179,6 +181,8 @@ services:
       POSTS_SERVICE_HOST: postsservice
       POSTS_SERVICE_PORT: 5000
       STATS_SERVICE_WDSL: "http://statisticsservice:5000/soapws/statistics?wsdl"
+      TTS_SERVICE_HOST: texttospeechservice
+      TTS_SERVICE_PORT: 5000
 
 ############# Web Client ################
 #  webclient:

src/postsservice/Service/BasicPostsService.cs

@@ -61,18 +61,19 @@ public Task<List<Post>> GetPosts(PaginationFilter paginationFilter, PostsFilter
                 .Where(p => postsFilter.User == null ? true : p.AuthorId == postsFilter.User)
                 .Where(p => postsFilter.Language == null ? true : languages.Contains(p.Language));
 
-            // now pagination
-            postsQueryable = postsQueryable
-                .Skip(paginationFilter.Offset)
-                .Take(paginationFilter.Limit);
-
             // sorting...
             // at this point the name of the property has been validated to exist
             if (sortingInfo.Order.Equals("asc"))
                 postsQueryable = postsQueryable.OrderBy(p => EF.Property<object>(p, sortingInfo.SortBy));
             else
                 postsQueryable = postsQueryable.OrderByDescending(p => EF.Property<object>(p, sortingInfo.SortBy));
 
+            // now pagination
+            postsQueryable = postsQueryable
+                .Skip(paginationFilter.Offset)
+                .Take(paginationFilter.Limit);
+
+
             // and get the posts!!
             return postsQueryable.ToListAsync();
         }

src/texttospeechservice/config.py

@@ -21,6 +21,7 @@ class BaseConfig():
     SERVICE_KEY = _try_get_config_from_env('SERVICE_KEY', 'tts_service')
     LOCALE_MAPPINGS_FILE = _try_get_config_from_env('MAPPINGS_FILE', 'lang2locale.csv')
     DEPLOY_PORT = int(_try_get_config_from_env('DEPLOY_PORT', '5000'))
+    STATISTICS_SERVICE_ENDPOINT = _try_get_config_from_env('STATISTICS_SERVICE_ENDPOINT', 'http://localhost:5000/soapws/statistics?wsdl')
 
 class DevelopmentConfig(BaseConfig):
     DEBUG = True

src/texttospeechservice/src/clients/soap_client.py

@@ -14,7 +14,7 @@ def __init__(self, successful, result=None):
         self.result = result
 
 
-class SoapClient:
+class SoapClient(object):
     """ Allows making request to a given SOAP endpoint.
 
     This class uses the ZEEP Python library (https://docs.python-zeep.org/en/master/index.html#)
@@ -35,14 +35,15 @@ def __init__(self, wsdl_endpoint):
         settings = zeep.Settings(strict=False, xml_huge_tree=True)
         self.client = zeep.Client(wsdl=wsdl_endpoint, settings=settings)
 
-    def __getattribute__(self, attr_name, *args, **kwargs):
-        logger.debug(f"Calling method of SOAP Client: {attr_name}")
+    def call_method(self, method_name, *args, **kwargs):
+        logger.debug(f"Calling method of SOAP Client: {method_name}")
         logger.debug(f"Args: {args} - Kwargs: {kwargs}")
         try:
-            res = getattr(client.service, attr_name)(*args, **kwargs)
+            res = getattr(self.client.service, method_name)(*args, **kwargs)
             logger.info(f"SOAP request was successful. Result: {res}")
             return SoapResult(True, res)
         except Exception as e:
             logger.error(f"There was an error calling the SOAP client: {e}")
             logger.debug("Returning unsuccessful SOAP result")
             return SoapResult(False)
+    

src/texttospeechservice/src/controller.py

@@ -2,6 +2,7 @@
 """
 
 import base64
+import json
 import logging
 
 from flask import current_app as app
@@ -16,7 +17,7 @@
 logger.setLevel(logging.DEBUG)
 
 gcloud_tts_client = GCloudTTSClient()
-#statistics_client = SoapClient()
+statistics_client = SoapClient(app.config['STATISTICS_SERVICE_ENDPOINT'])
 locale_manager = LocaleManager(app.config['LOCALE_MAPPINGS_FILE'])
 
 
@@ -35,6 +36,14 @@ def tts():
     """
     logger.debug("POST to TextsToSpeechs received")
     body_data = request.get_json()
+    if 'passport' in request.headers:
+        logger.debug("Passport found")
+        passport = json.loads(request.headers.get('passport'))
+        logger.debug(f"Passport: {passport}")
+        user_id = passport['userId_']
+    else:
+        user_id = "1"
+    logger.debug(f"User ID: {user_id}")
     logger.debug(f"Data: {body_data}")
 
     if 'language' not in body_data or 'text' not in body_data:
@@ -61,9 +70,7 @@ def tts():
         # A user can then use it with base64.b64decode(audio_str)
         logger.debug("Encoding audio file to base64 and decoding to string...")
         audio_str = base64.b64encode(audio).decode()
-
-        # TODO: call statistics service to update number of tts of user
-        #statistics_client.update_
+        statistics_client.call_method('registerTextToSpeechCreatedEvent', user_id)
 
         return jsonify({
             'locale': locale,