modified stock-wallet

Author: andrea-mucci

tutorials/stock-wallet/docker-compose.yml

@@ -75,24 +75,6 @@ services:
     - postgres
     - kafka
     - discovery
-  appsmith:
-    image: index.docker.io/appsmith/appsmith-ce
-    container_name: appsmith
-    ports:
-    - 80:80
-    - 443:443
-    - 9001:9001
-    volumes:
-    - ./stacks:/appsmith-stacks
-    labels:
-      com.centurylinklabs.watchtower.enable: 'true'
-    restart: unless-stopped
-  auto_update:
-    image: containrrr/watchtower:latest-dev
-    volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
-    command: --schedule "0 0 * ? * *" --label-enable --cleanup
-    restart: unless-stopped
   microservice-stocks:
     restart: always
     build:

tutorials/stock-wallet/microservices/stocks/src/aggregates.py

@@ -29,10 +29,9 @@ class StocksAggregate(Aggregate[Stocks]):
     """StocksAggregate class."""
 
     @staticmethod
-    async def add_ticker_to_stock(ticker: str) -> UUID:
+    async def add_ticker_to_stock(ticker: str, updated: str) -> UUID:
         """Create a new instance."""
-
-        stocks = await Stocks.create(ticker=ticker, updated="Never", quotes=EntitySet())
+        stocks = await Stocks.create(ticker=ticker, updated=updated, quotes=EntitySet())
         return stocks
 
     @staticmethod

tutorials/stock-wallet/microservices/stocks/src/commands/services.py

@@ -27,7 +27,9 @@ class StocksCommandService(CommandService):
     async def set_stock_ticker(self, request: Request):
         event: Event = await request.content()
         for ticker in event["tickers"]:
-            await StocksAggregate.add_ticker_to_stock(ticker["ticker"])
+            if ticker['flag'] == "ticker":
+                now = pendulum.now()
+                await StocksAggregate.add_ticker_to_stock(ticker["ticker"], now.to_datetime_string())
 
     def call_remote(self, ticker, from_: str, to_: str):
         with RESTClient("") as client:
@@ -43,16 +45,18 @@ async def get_stock_values(self, request: Request):
         if len(tickers) > 0:
             for ticker in tickers:
                 ticker_updated = pendulum.parse(ticker["updated"])
-                results = await self.call_remote(ticker["ticker"],
+                results = self.call_remote(ticker["ticker"],
                                                  now_minus_one_month.to_date_string(),
                                                  now.to_date_string())
                 for result in results:
-                    result_date = pendulum.parse(result["t"])
-                    difference_ticker_result = ticker_updated.diff(result_date).in_hours()
-                    if difference_ticker_result < 0:
+                    result_date = pendulum.from_timestamp(result["t"]/1000)
+                    # difference_ticker_result = ticker_updated.diff(result_date).in_hours()
+                    if ticker_updated < result_date:
                         await StocksAggregate.update_time_ticker(ticker["uuid"], result_date.to_datetime_string())
+                        logger.warning("Date time ticker updated")
                         when = result_date.to_datetime_string()
                         await StocksAggregate.add_quotes(ticker["uuid"], {"close": result['c'],
                                                                           "volume": result['v'],
                                                                           "when": when})
+                        logger.warning("Added new quote")
 

tutorials/stock-wallet/microservices/wallet/src/queries/repository.py

@@ -47,12 +47,12 @@ def get_wallets(self):
         wallets_query = self.session.query(Wallet).all()
         wallets = []
         for wallet in wallets_query:
-            wallets.append({"name": wallet.name, "uuid": wallet.uuid})
+            wallets.append({"wallet_name": wallet.name, "uuid": wallet.uuid})
         return wallets
 
     def get_wallet(self, uuid):
         wallet_query = self.session.query(Wallet).filter(Wallet.uuid == uuid).first()
-        return {"id": wallet_query.id, "uuid": wallet_query.uuid, "name": wallet_query.name}
+        return {"id": wallet_query.id, "uuid": wallet_query.uuid, "wallet_name": wallet_query.name}
 
     def add_tickers(self, wallet_uuid: str, ticker: dict):
         wallet = self.session.query(Wallet).filter(Wallet.uuid == wallet_uuid).first()