From 792fff13b8373a80552d4e023fabd46ebbb6fbba Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Wed, 27 Nov 2019 22:37:42 -0800
Subject: [PATCH] added hasadjustments and tests for Photo5

---
 osxphotos/__init__.py          |  9 ++++++---
 tests/test_catalina_10_15_1.py | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osxphotos/__init__.py b/osxphotos/__init__.py
index 7037badc..8d6f20a5 100644
--- a/osxphotos/__init__.py
+++ b/osxphotos/__init__.py
@@ -736,7 +736,8 @@ class PhotosDB:
             "ZGENERICASSET.ZDIRECTORY, "
             "ZGENERICASSET.ZFILENAME, "
             "ZGENERICASSET.ZLATITUDE, "
-            "ZGENERICASSET.ZLONGITUDE "
+            "ZGENERICASSET.ZLONGITUDE, "
+            "ZGENERICASSET.ZHASADJUSTMENTS "
             "FROM ZGENERICASSET "
             "JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK "
             "WHERE ZGENERICASSET.ZTRASHEDSTATE = 0 AND ZGENERICASSET.ZKIND = 0 "
@@ -764,7 +765,8 @@ class PhotosDB:
         # 11   "ZGENERICASSET.ZDIRECTORY, "
         # 12   "ZGENERICASSET.ZFILENAME, "
         # 13   "ZGENERICASSET.ZLATITUDE, "
-        # 14   "ZGENERICASSET.ZLONGITUDE "
+        # 14   "ZGENERICASSET.ZLONGITUDE, "
+        # 15   "ZGENERICASSET.ZHASADJUSTMENTS "
 
         i = 0
         for row in c:
@@ -811,13 +813,14 @@ class PhotosDB:
                 self._dbphotos[uuid]["latitude"] = row[13]
                 self._dbphotos[uuid]["longitude"] = row[14]
 
+            self._dbphotos[uuid]["hasAdjustments"] = row[15]
+
             # these will get filled in later
             # init to avoid key errors
             self._dbphotos[uuid]["extendedDescription"] = None  # fill this in later
             self._dbphotos[uuid]["localAvailability"] = None
             self._dbphotos[uuid]["remoteAvailability"] = None
             self._dbphotos[uuid]["isMissing"] = None
-            self._dbphotos[uuid]["hasAdjustments"] = None
 
             # self._dbphotos[uuid]["isMissing"] = row[14]
 
diff --git a/tests/test_catalina_10_15_1.py b/tests/test_catalina_10_15_1.py
index f17f41aa..ecee2198 100644
--- a/tests/test_catalina_10_15_1.py
+++ b/tests/test_catalina_10_15_1.py
@@ -208,6 +208,28 @@ def test_location_2():
     assert lon is None
 
 
+def test_hasadjustments1():
+    # test hasadjustments == True
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=["E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51"])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.hasadjustments() == True 
+
+
+def test_hasadjustments2():
+    # test hasadjustments == False
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=["6191423D-8DB8-4D4C-92BE-9BBBA308AAC4"])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.hasadjustments() == False
+
+
 def test_count():
     import osxphotos