Perform several bug fixes

test.sh exits when pytest fails

temp_record initialisation applies default timestamp correct

enables providing local config.yaml via environment variable

.gitignore

@@ -11,3 +11,4 @@ package/
 requirements.txt
 htmlcov/
 .coverage
+config.local.yaml

scripts/test.sh

@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 echo "launching localstack container"
 docker run -d --rm --name localstack -p 4566:4566 -p 4571:4571 localstack/localstack
 

src/app.py

@@ -72,7 +72,8 @@ def initialize_application() -> MoodTrackerApplication:
     :return:
     """
     # Load and register configuration object
-    configuration = ConfigurationProvider().get_configuration().register()
+    config_path = os.environ.get("CONFIG_PATH", "config.yaml")
+    configuration = ConfigurationProvider(config_path).get_configuration().register()
     initialize_database(configuration)
 
     application = MoodTrackerApplication(TOKEN)

src/handlers/record_handlers.py

@@ -42,7 +42,7 @@ def create_temporary_record(user_id: int, user_repository: UserRepository):
     # todo handle find_user() == None?
     logging.info("Using user repository to find user: %s", user_repository)
     metrics = user_repository.find_user(user_id).metrics
-    record = TempRecord(metrics=metrics)
+    record = TempRecord(metrics)
 
     logging.info(f"Creating temporary record for user {user_id}: {record}")
     # Store temporary record in the record ExpiringDict

src/model/record.py

@@ -25,20 +25,20 @@ def __str__(self):
         return f"user_id: {self.user_id}, data: {self.data}, timestamp: {self.timestamp.isoformat()}"
 
 
-class TempRecord(BaseModel):
+class TempRecord:
     """
     Record that is being kept in the in-memory ExpiringDict while being completed.
     Differs from the database Record in that it holds data on the Metrics that are being gathered.
     """
 
     metrics: list[Metric]
-    timestamp: datetime | None
-    data: dict[str, int | None] = {}
+    timestamp: datetime
+    data: dict[str, int | None]
 
-    def __init__(self, **data):
-        super().__init__(**data)
+    def __init__(self, metrics: list[Metric]):
+        self.metrics = metrics
         self.data = {metric.name: None for metric in self.metrics}
-        self.datetime = datetime.now()
+        self.timestamp = datetime.now()
 
     def __str__(self):
         return f"data: {self.data}, timestamp: {self.timestamp.isoformat()}"

src/repository/db_utils.py

@@ -19,3 +19,5 @@ def init() -> (UserRepository, RecordRepository):
     logging.basicConfig(level=logging.INFO)
     user_id = int(os.getenv("USER_ID"))
     user_repository, record_repository = init()
+    for record in record_repository.get_latest_records_for_user(user_id, 2):
+        print(record)

terraform/dynamodb.tf

@@ -1,8 +1,3 @@
-moved {
-  from = module.dynamodb_table
-  to   = module.user
-}
-
 module "user" {
   source = "terraform-aws-modules/dynamodb-table/aws"
 

test/unit/model/test_record.py

@@ -18,7 +18,7 @@ def record() -> Record:
 @pytest.fixture
 def temp_record() -> TempRecord:
     return TempRecord(
-        metrics=[
+        [
             Metric(name="metric-1", user_prompt="metric user prompt", values={"1": 1}),
         ],
     )