Merge pull request #95 from FreeTAKTeam/fix-and-extend-filmology

naman108 · web-flow · commit 209a24ca4e1d · 2025-02-23T17:03:22.000-04:00
Fix and extend filmology example
diff --git a/digitalpy/core/digipy_configuration/impl/inifile_configuration.py b/digitalpy/core/digipy_configuration/impl/inifile_configuration.py
@@ -191,6 +191,11 @@ def parse_ini_stream(self, config_array: dict, stream: TextIOBase):
                 if value.startswith("[") and not value.endswith("]"):
                     while True:
                         line = next(lines).strip()
+
+                        # ignore comments and empty lines
+                        if line == "" or line[0] == ";":
+                            continue
+                        
                         if line.endswith("]"):
                             value+=line
                             break
diff --git a/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Actor.json b/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Actor.json
@@ -45,7 +45,7 @@
 				"CompositionPosterPrimary":
 					{
 						"$ref": "#/definitions/Poster"
-					},,,
+					},
 				"Date":
 					{
 						"$ref": "#/definitions/Date"
diff --git a/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Date.json b/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Date.json
@@ -56,7 +56,7 @@
 				"CompositionPosterPrimary":
 					{
 						"$ref": "#/definitions/Poster"
-					},,,
+					},
 				"Date":
 					{
 						"$ref": "#/definitions/Date"
diff --git a/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Director.json b/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Director.json
@@ -45,7 +45,7 @@
 				"CompositionPosterPrimary":
 					{
 						"$ref": "#/definitions/Poster"
-					},,,
+					},
 				"Date":
 					{
 						"$ref": "#/definitions/Date"
diff --git a/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Movie.json b/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Movie.json
@@ -39,7 +39,7 @@
 				"CompositionPosterPrimary":
 					{
 						"$ref": "#/definitions/Poster"
-					},,,
+					},
 				"Date":
 					{
 						"$ref": "#/definitions/Date"
diff --git a/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Poster.json b/examples/filmology_app/components/FilmologyManagement/configuration/model_definitions/Poster.json
@@ -45,7 +45,7 @@
 				"CompositionPosterPrimary":
 					{
 						"$ref": "#/definitions/Poster"
-					},,,
+					},
 				"Date":
 					{
 						"$ref": "#/definitions/Date"
diff --git a/examples/filmology_app/components/FilmologyManagement/controllers/directors/date_director.py b/examples/filmology_app/components/FilmologyManagement/controllers/directors/date_director.py
@@ -50,7 +50,7 @@ def construct_from_db(self, Date: 'DBDate', config_loader, base_object: 'Date' =
             self.Movie_builder.build_empty_object(config_loader=config_loader)
             self.Movie_builder.add_object_data(mapped_object=DateAggregationMovie, protocol=None)
             DateAggregationMovie_completed = self.Movie_builder.get_result()
-            Date_completed.DateAggregationMovie.append(Movie_completed.oid)
+            Date_completed.DateAggregationMovie.append(DateAggregationMovie_completed.oid)
 
         return Date_completed
 
diff --git a/examples/filmology_app/components/FilmologyManagement/persistence/date.py b/examples/filmology_app/components/FilmologyManagement/persistence/date.py
@@ -16,7 +16,7 @@ class Date(FilmologyManagementBase):
     year: Mapped[str]
     name: Mapped[str]
 
-    DateAggregationMovie: Mapped[List["Movie"]] = relationship("Movie")
+    DateAggregationMovie: Mapped[List["Movie"]] = relationship("Movie", lazy="joined")
 
     @validates('DateAggregationMovie_oid')
     def validate_DateAggregationMovie_oid(self, key, DateAggregationMovie_oid):
diff --git a/examples/filmology_app/components/FilmologyManagement/persistence/movie.py b/examples/filmology_app/components/FilmologyManagement/persistence/movie.py
@@ -31,9 +31,9 @@ class Movie(FilmologyManagementBase):
     modified: Mapped[str]
 
     CompositionPosterPrimary_oid: Mapped[str] = mapped_column(ForeignKey("Poster.oid"))
-    CompositionPosterPrimary: Mapped["Poster"] = relationship("Poster")
+    CompositionPosterPrimary: Mapped["Poster"] = relationship("Poster", lazy="joined")
     Date_oid: Mapped[str] = mapped_column(ForeignKey("Date.oid"))
-    Date: Mapped["Date"] = relationship("Date")
+    Date: Mapped["Date"] = relationship("Date", lazy="joined")
     CompositionActor_oid: Mapped[Optional[str]] = mapped_column(ForeignKey("Actor.oid"))
     Director_oid: Mapped[Optional[str]] = mapped_column(ForeignKey("Director.oid"))
 
diff --git a/examples/filmology_app/tests/test_filmology_facade.py b/examples/filmology_app/tests/test_filmology_facade.py
@@ -24,34 +24,209 @@ def filmology_management_db_mock():
     yield db_mock
 
     db_mock.stop()
-    if os.path.exists("filmology_management.db"):
-        os.remove("filmology_management.db")
+
+    os.remove("filmology_management.db")
+
+def seed_database(url):
+    from sqlite3 import connect
+    connect(url).executescript("""INSERT INTO Director (oid,creator,nationality,surname,created,last_editor,name,birth,description,modified) VALUES
+	 ('Director:8721cddb-efe4-11ef-b8e9-60dd8ec76433','Michael Thompson','American','Thompson','2025-02-20','Sarah Lee','Michael','1985-08-30','A data scientist with expertise in machine learning and AI.','2025-02-22T14:45:00Z');
+    INSERT INTO Actor (oid,creator,nationality,surname,created,last_editor,name,birth,description,modified,Movie_oid) VALUES
+	 ('Actor:0393e0e8-efe4-11ef-875b-60dd8ec76433','Alice Johnson','Canadian','Johnson','2025-02-20','Bob Smith','Alice','1990-05-15','A software engineer specializing in backend development.','2025-02-21T10:15:30Z',NULL);
+    INSERT INTO Date (oid,"year",name) VALUES
+	 ('Date:c2aa3824-efdc-11ef-a8ca-60dd8ec76433','2004','bday'),
+     ('Date:faa3b1b4-efdb-11ef-8b1b-60dd8ec76433','2005','new day');
+    INSERT INTO Genre (oid,name) VALUES
+	 ('Genre:3b053d2a-ae98-11ef-bd08-60dd8ec76433','horror'),
+	 ('Genre:8304ae3b-efdd-11ef-bd39-60dd8ec76433','tragedy');
+    INSERT INTO Movie (oid,date,country,creator,color,created,last_editor,runtime,description,URL,plot,name,alias,modified,CompositionPosterPrimary_oid,Date_oid) VALUES
+	 ('Movie:efba28d6-efe0-11ef-b7f9-60dd8ec76433','2025-02-22','Canada','Jane Doe','#FF5733','2025-02-20','John Smith','120 minutes','This is a sample project demonstrating JSON schema usage.','https://www.example.com/sample_project','A brief overview of the project''s objectives and scope.','Sample Project','sample_project','2025-02-21T15:30:00Z','Poster:f5698d56-efdb-11ef-a458-60dd8ec76433','Date:c2aa3824-efdc-11ef-a8ca-60dd8ec76433');
+    INSERT INTO Poster (oid,name) VALUES
+	 ('Poster:f5698d56-efdb-11ef-a458-60dd8ec76433','a poster'),
+     ('Poster:faa3b1b4-efdb-11ef-8b1b-60dd8ec76433','another poster');
+""").close()
 
 @pytest.mark.usefixtures("filmology_management_db_mock")
-def test_post_director(client_mock, test_environment):
+def test_post_director_lifecycle(client_mock, test_environment):
     request, response, _ = test_environment
 
     filmology_management_facade = initialize_facade(
-        "filmology_app.components.FilmologyManagement.FilmologyManagement",
+        "filmology_app.components.FilmologyManagement.FilmologyManagement_facade.FilmologyManagement",
         request,
         response,
     )
 
+    seed_database("filmology_management.db")
+
     request.set_value("client", client_mock)
 
     request.set_value("body", json.dumps({
-        "creator": "John Doe",
+        "created": "2025-02-20",
+        "creator": "Michael Thompson",
+        "last_editor": "Sarah Lee",
+        "modified": "2025-02-22T14:45:00Z",
+        "name": "Michael",
+        "description": "A data scientist with expertise in machine learning and AI.",
+        "surname": "Thompson",
+        "birth": "1985-08-30",
         "nationality": "American",
-        "surname": "Doe",
-        "created": "2023-01-01",
-        "last_editor": "Jane Smith",
-        "name": "John",
-        "birth": "1970-01-01",
-        "description": "A well-known director",
-        "modified": "2023-01-02"
-    }))
+    }).encode())
 
     filmology_management_facade.execute("POSTDirector")
 
     assert len(response.get_value("message")) == 1
-    #assert response.get_value("message")[0] == "Director added successfully"
+    assert response.get_value("message")[0].name == "Michael"
+    assert response.get_value("message")[0].surname == "Thompson"
+    assert response.get_value("message")[0].birth == "1985-08-30"
+    assert response.get_value("message")[0].nationality == "American"
+    assert response.get_value("message")[0].created == "2025-02-20"
+    assert response.get_value("message")[0].creator == "Michael Thompson"
+    assert response.get_value("message")[0].last_editor == "Sarah Lee"
+    assert response.get_value("message")[0].description == "A data scientist with expertise in machine learning and AI."
+    assert response.get_value("message")[0].modified == "2025-02-22T14:45:00Z"
+
+@pytest.mark.usefixtures("filmology_management_db_mock")
+def test_get_director(client_mock, test_environment):
+    request, response, _ = test_environment
+
+    filmology_management_facade = initialize_facade(
+        "filmology_app.components.FilmologyManagement.FilmologyManagement_facade.FilmologyManagement",
+        request,
+        response,
+    )
+
+    seed_database("filmology_management.db")
+
+    request.set_value("client", client_mock)
+
+    filmology_management_facade.execute("GETDirector")
+
+    assert len(response.get_value("message")) == 1
+    assert response.get_value("message")[0].name == "Michael"
+    assert response.get_value("message")[0].surname == "Thompson"
+    assert response.get_value("message")[0].birth == "1985-08-30"
+    assert response.get_value("message")[0].nationality == "American"
+    assert response.get_value("message")[0].created == "2025-02-20"
+    assert response.get_value("message")[0].creator == "Michael Thompson"
+
+@pytest.mark.usefixtures("filmology_management_db_mock")
+def test_post_movie(client_mock, test_environment):
+    request, response, _ = test_environment
+
+    filmology_management_facade = initialize_facade(
+        "filmology_app.components.FilmologyManagement.FilmologyManagement_facade.FilmologyManagement",
+        request,
+        response,
+    )
+
+    seed_database("filmology_management.db")
+
+    request.set_value("client", client_mock)
+
+    request.set_value("body", json.dumps({
+        "created": "2025-02-20",
+        "creator": "Jane Doe",
+        "last_editor": "John Smith",
+        "modified": "2025-02-21T15:30:00Z",
+        "name": "Sample Project",
+        "description": "This is a sample project demonstrating JSON schema usage.",
+        "alias": "sample_project",
+        "plot": "A brief overview of the project's objectives and scope.",
+        "color": "#FF5733",
+        "runtime": "120 minutes",
+        "country": "Canada",
+        "date": "2025-02-22",
+        "URL": "https://www.example.com/sample_project",
+        "CompositionPosterPrimary": "Poster:faa3b1b4-efdb-11ef-8b1b-60dd8ec76433",
+        "Date": "Date:faa3b1b4-efdb-11ef-8b1b-60dd8ec76433",
+    }).encode())
+
+    filmology_management_facade.execute("POSTMovie")
+
+    assert len(response.get_value("message")) == 1
+    assert response.get_value("message")[0].name == "Sample Project"
+    assert response.get_value("message")[0].alias == "sample_project"
+    assert response.get_value("message")[0].plot == "A brief overview of the project's objectives and scope."
+    assert response.get_value("message")[0].color == "#FF5733"
+    assert response.get_value("message")[0].runtime == "120 minutes"
+    assert response.get_value("message")[0].country == "Canada"
+    assert response.get_value("message")[0].date == "2025-02-22"
+    assert response.get_value("message")[0].URL == "https://www.example.com/sample_project"
+    assert response.get_value("message")[0].created == "2025-02-20"
+    assert response.get_value("message")[0].creator == "Jane Doe"
+    assert response.get_value("message")[0].last_editor == "John Smith"
+    assert response.get_value("message")[0].modified == "2025-02-21T15:30:00Z"
+
+@pytest.mark.usefixtures("filmology_management_db_mock")
+def test_get_movies(client_mock, test_environment):
+    request, response, _ = test_environment
+
+    filmology_management_facade = initialize_facade(
+        "filmology_app.components.FilmologyManagement.FilmologyManagement_facade.FilmologyManagement",
+        request,
+        response,
+    )
+
+    seed_database("filmology_management.db")
+
+    request.set_value("client", client_mock)
+
+    filmology_management_facade.execute("GETMovie")
+
+    assert len(response.get_value("message")) == 1
+    assert response.get_value("message")[0].name == "Sample Project"
+    assert response.get_value("message")[0].alias == "sample_project"
+    assert response.get_value("message")[0].plot == "A brief overview of the project's objectives and scope."
+    assert response.get_value("message")[0].color == "#FF5733"
+    assert response.get_value("message")[0].runtime == "120 minutes"
+    assert response.get_value("message")[0].country == "Canada"
+    assert response.get_value("message")[0].date == "2025-02-22"
+    assert response.get_value("message")[0].URL == "https://www.example.com/sample_project"
+    assert response.get_value("message")[0].created == "2025-02-20"
+    assert response.get_value("message")[0].creator == "Jane Doe"
+    assert response.get_value("message")[0].last_editor == "John Smith"
+
+@pytest.mark.usefixtures("filmology_management_db_mock")
+def test_post_date(client_mock, test_environment):
+    request, response, _ = test_environment
+
+    filmology_management_facade = initialize_facade(
+        "filmology_app.components.FilmologyManagement.FilmologyManagement_facade.FilmologyManagement",
+        request,
+        response,
+    )
+
+    seed_database("filmology_management.db")
+
+    request.set_value("client", client_mock)
+
+    request.set_value("body", json.dumps({
+        "year": "2005",
+        "name": "new day",
+    }).encode())
+
+    filmology_management_facade.execute("POSTDate")
+
+    assert len(response.get_value("message")) == 1
+    assert response.get_value("message")[0].year == "2005"
+    assert response.get_value("message")[0].name == "new day"
+
+@pytest.mark.usefixtures("filmology_management_db_mock")
+def test_get_date(client_mock, test_environment):
+    request, response, _ = test_environment
+
+    filmology_management_facade = initialize_facade(
+        "filmology_app.components.FilmologyManagement.FilmologyManagement_facade.FilmologyManagement",
+        request,
+        response,
+    )
+
+    seed_database("filmology_management.db")
+
+    request.set_value("client", client_mock)
+
+    filmology_management_facade.execute("GETDate")
+
+    assert len(response.get_value("message")) == 2
+    assert response.get_value("message")[1].year == "2005"
+    assert response.get_value("message")[1].name == "new day"
diff --git a/tests/test_configuration/test_configuration_resources/test_section_comment.ini b/tests/test_configuration/test_configuration_resources/test_section_comment.ini
@@ -0,0 +1,11 @@
+; The digitalpy.core_api configuration is used to configure the core API. The core API is the default API exposed by the DigitalPy application.
+; The commented out configuration below is the default configuration for the core API. Flows can be added to the core API to expose new functionality.
+[section_a]
+;port = 8080
+;host = 0.0.0.0
+list = [
+; FilmologyManagement component flows
+item1
+,item2
+,item3
+]
diff --git a/tests/test_configuration/test_inifile_configuration.py b/tests/test_configuration/test_inifile_configuration.py
@@ -110,4 +110,9 @@ def test_multi_line_list_values():
     configuration = InifileConfiguration(str(PurePath(__file__).parent / "test_configuration_resources"))
     configuration.add_configuration(os.sep+"multi_line_list_values.ini")
     assert configuration.get_value("key_int_list_multi", "Section1") == [1.1, 2.0, 3.0]
-    assert configuration.get_value("key_str_list_multi", "Section1") == ["a", "b", "c"]
+    assert configuration.get_value("key_str_list_multi", "Section1") == ["a", "b", "c"]
+
+def test_section_comment():
+    configuration = InifileConfiguration(str(PurePath(__file__).parent / "test_configuration_resources"))
+    configuration.add_configuration(os.sep+"test_section_comment.ini")
+    assert configuration.get_value("list", "section_a") == ["item1","item2","item3"]

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"CompositionPosterPrimary":`
`46`	`46`	`{`
`47`	`47`	`"$ref": "#/definitions/Poster"`
`48`		`- },,,`
	`48`	`+ },`
`49`	`49`	`"Date":`
`50`	`50`	`{`
`51`	`51`	`"$ref": "#/definitions/Date"`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`"CompositionPosterPrimary":`
`57`	`57`	`{`
`58`	`58`	`"$ref": "#/definitions/Poster"`
`59`		`- },,,`
	`59`	`+ },`
`60`	`60`	`"Date":`
`61`	`61`	`{`
`62`	`62`	`"$ref": "#/definitions/Date"`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`"CompositionPosterPrimary":`
`40`	`40`	`{`
`41`	`41`	`"$ref": "#/definitions/Poster"`
`42`		`- },,,`
	`42`	`+ },`
`43`	`43`	`"Date":`
`44`	`44`	`{`
`45`	`45`	`"$ref": "#/definitions/Date"`