When saving, exclude_unset doesn't always behave as expected

So we remove exclude_unset, which will increase the size of the output, but that's not big deal.

Author: Lennart Regebro

CHANGES.txt

@@ -4,7 +4,7 @@ Changes
 1.2.0b3 (unreleased)
 --------------------
 
-- Nothing changed yet.
+- Now includes default values when saving, making the OCF files larger.
 
 
 1.2.0b2 (2025-02-04)

src/pyocf/captable.py

@@ -103,7 +103,7 @@ def file_factory(p):
     def _save_ocf_files(self, manifest_path, issuer, file_factory, pretty):
         if issuer is None and self.manifest is None:
             raise ValueError(
-                "You must specify an issuer, either by passing the value to the"
+                "You must specify an issuer, either by passing the value to the "
                 "save method, or by creating a Manifest."
             )
 
@@ -125,7 +125,7 @@ def _save_ocf_files(self, manifest_path, issuer, file_factory, pretty):
 
             with file_factory(ocffilename) as ocffile:
                 itemfile = fileob(items=getattr(self, filetype))
-                jsonstr = itemfile.json(exclude_unset=True)
+                jsonstr = itemfile.model_dump_json()
                 if pretty:
                     jsonstr = json.dumps(json.loads(jsonstr), indent=4)
                 jsonstr = jsonstr.encode("UTF-8")
@@ -156,7 +156,7 @@ def _save_ocf_files(self, manifest_path, issuer, file_factory, pretty):
         self.manifest = ocfmanifestfile.OCFManifestFile(**manifest_data)
 
         with file_factory(manifest_path) as ocffile:
-            jsonstr = self.manifest.json()
+            jsonstr = self.manifest.model_dump_json()
             if pretty:
                 jsonstr = json.dumps(json.loads(jsonstr), indent=4)
             ocffile.write(jsonstr.encode("UTF-8"))

tests/test_save.py

@@ -57,6 +57,11 @@ def test_save_directory():
             # Do some simple checks on the data
             assert b'"file_type": "OCF_MANIFEST_FILE"' in data
             assert b'"filepath": "StockLegends.ocf.json",' in data
+
+            transactions = [x for x in files if x.name == "Transactions.ocf.json"][0]
+            data = transactions.open("rb").read()
+            assert b'"object_type": "TX_EQUITY_COMPENSATION_RELEASE"' in data
+
     except (PermissionError, NotADirectoryError):
         # Bugs in windows give permission errors for absolutely no reason
         # when deleting temporary files. Ignore them.