From 00f98ef109b81b41c292ee50a12b749fe0826bc2 Mon Sep 17 00:00:00 2001
From: Daniel Brooks <bass_rock@me.com>
Date: Tue, 8 Oct 2024 17:35:58 -0700
Subject: [PATCH] fix(url): adding in url resolving

---
 .run/tests.run.xml                            |  4 +++-
 app/graphql/item.py                           | 10 ++++----
 app/graphql/recommendation.py                 |  2 +-
 app/models/candidate.py                       |  1 +
 app/models/item.py                            |  1 +
 app/models/recommendation.py                  |  2 +-
 .../models/test_candidate_set_model.py        |  9 ++++---
 .../models/test_slate_lineup_model.py         | 24 ++++++++++++-------
 tests/functional/models/test_slate_model.py   | 12 ++++++----
 tests/unit/utils.py                           |  4 ++--
 10 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/.run/tests.run.xml b/.run/tests.run.xml
index 9bf9d820c..a65f2ffd6 100644
--- a/.run/tests.run.xml
+++ b/.run/tests.run.xml
@@ -1,11 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="tests" type="tests" factoryName="py.test">
     <module name="recommendation-api" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="" />
+    <option name="SDK_NAME" value="Remote Python 3.11.2 Docker Compose (app)" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
+    <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/app/graphql/item.py b/app/graphql/item.py
index 4cce860e6..a41a7849d 100644
--- a/app/graphql/item.py
+++ b/app/graphql/item.py
@@ -1,19 +1,21 @@
-from typing import List, Optional
+from typing import List, Optional, NewType
 
 import strawberry
 from strawberry.federation.schema_directives import Key, Requires
 
 from app.graphql.corpus_recommendation import CorpusRecommendation
 from app.graphql.directives import CacheControl
+from app.graphql.link import Url
 from app.graphql.resolvers.item2item_resolvers import resolve_similar_to_saved, resolve_after_article
 from app.models.item import ItemModel
 
 
 @strawberry.experimental.pydantic.type(
     model=ItemModel,
-    directives=[Key(fields="itemId")])
+    directives=[Key(fields="itemId"), Key(fields="givenUrl")])
 class Item:
     item_id: str  # This type is a 'str' and not an 'ID' in our graph.
+    given_url: Url  # This type is a 'str' and not an 'ID' in our graph.
 
     # a field from a different subgraph
     # see https://www.apollographql.com/docs/federation/entities-advanced/#contributing-computed-entity-fields
@@ -21,12 +23,12 @@ class Item:
 
     relatedAfterArticle: List[CorpusRecommendation] = strawberry.field(
         directives=[CacheControl(maxAge=3600),
-                    Requires(fields='language')],
+                    Requires(fields='language itemId')],
         resolver=resolve_after_article,
         description='Recommend similar articles to show in the bottom of an article.')
 
     relatedAfterCreate: List[CorpusRecommendation] = strawberry.field(
         directives=[CacheControl(maxAge=3600),
-                    Requires(fields='language')],
+                    Requires(fields='language itemId')],
         resolver=resolve_similar_to_saved,
         description='Recommend similar articles after saving.')
diff --git a/app/graphql/recommendation.py b/app/graphql/recommendation.py
index b222f510c..d0c8aade7 100644
--- a/app/graphql/recommendation.py
+++ b/app/graphql/recommendation.py
@@ -20,6 +20,6 @@ class Recommendation:
     feed_item_id: Optional[strawberry.ID] = strawberry.field(deprecation_reason="Use `id`")
     feed_id: auto
     item_id: strawberry.ID
-    item: Item = strawberry.federation.field(shareable=True)
+    item: Item = strawberry.federation
     rec_src: str
     publisher: auto
diff --git a/app/models/candidate.py b/app/models/candidate.py
index af04c12df..6099b9736 100644
--- a/app/models/candidate.py
+++ b/app/models/candidate.py
@@ -5,3 +5,4 @@ class Candidate(BaseModel):
     item_id: int
     publisher: str
     feed_id: Optional[int]
+    url: str
diff --git a/app/models/item.py b/app/models/item.py
index 582657c14..96f3a21ef 100644
--- a/app/models/item.py
+++ b/app/models/item.py
@@ -3,3 +3,4 @@
 
 class ItemModel(BaseModel):
     item_id: str
+    given_url: str
diff --git a/app/models/recommendation.py b/app/models/recommendation.py
index 8d455c382..09bdbc548 100644
--- a/app/models/recommendation.py
+++ b/app/models/recommendation.py
@@ -52,7 +52,7 @@ def candidate_dict_to_recommendation(candidate: dict):
             feed_id=candidate.get('feed_id'),
             publisher=candidate.get('publisher'),
             item_id=candidate.get('item_id'),
-            item=ItemModel(item_id=candidate.get('item_id'))
+            item=ItemModel(item_id=candidate.get('item_id'), url=candidate.get('url')),
         )
         recommendation.feed_item_id = recommendation.id
         return recommendation
diff --git a/tests/functional/models/test_candidate_set_model.py b/tests/functional/models/test_candidate_set_model.py
index 1c1d312fe..60e8b3212 100644
--- a/tests/functional/models/test_candidate_set_model.py
+++ b/tests/functional/models/test_candidate_set_model.py
@@ -14,7 +14,8 @@ async def test_verify_candidate_set(candidate_sets_dynamodb_table, aiocache_fixt
             {
                 "feed_id": 1,
                 "item_id": 3208490410,
-                "publisher": "hbr.org"
+                "publisher": "hbr.org",
+                "url": "https://hbr.org"
             }
         ]
     })
@@ -32,7 +33,8 @@ async def test_get_candidate_set(candidate_sets_dynamodb_table, aiocache_fixture
             {
                 "feed_id": 1,
                 "item_id": 3208490410,
-                "publisher": "hbr.org"
+                "publisher": "hbr.org",
+                "url": "https://hbr.org"
             }
         ]
     })
@@ -54,7 +56,8 @@ async def test_get_cached_candidate_set(candidate_sets_dynamodb_table, aiocache_
             {
                 "feed_id": 1,
                 "item_id": 3208490410,
-                "publisher": "hbr.org"
+                "publisher": "hbr.org",
+                "url": "https://hbr.org"
             }
         ]
     })
diff --git a/tests/functional/models/test_slate_lineup_model.py b/tests/functional/models/test_slate_lineup_model.py
index a20faccbc..ae217207d 100644
--- a/tests/functional/models/test_slate_lineup_model.py
+++ b/tests/functional/models/test_slate_lineup_model.py
@@ -18,7 +18,8 @@
         {
             "feed_id": 1,
             "item_id": 3208490410,
-            "publisher": "hbr.org"
+            "publisher": "hbr.org",
+            "url": "https://hbr.org"
         }
     ]
 }
@@ -31,12 +32,14 @@
         {
             "feed_id": 1,
             "item_id": 11,
-            "publisher": "getpocket.com"
+            "publisher": "getpocket.com",
+            "url": "https://getpocket.com"
         },
         {
             "feed_id": 1,
             "item_id": 12,
-            "publisher": "getpocket.com"
+            "publisher": "getpocket.com",
+            "url": "https://getpocket.com/item/test"
         }
     ]
 }
@@ -119,17 +122,20 @@ async def test_get_slate_lineup_limited_recs(self, slate_config, slate_lineup_co
                 {
                     "feed_id": 1,
                     "item_id": 3208490410,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org"
                 },
                 {
                     "feed_id": 1,
                     "item_id": 3208650410,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/2"
                 },
                 {
                     "feed_id": 1,
                     "item_id": 32084925410,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/4"
                 }
             ]
         })
@@ -156,12 +162,14 @@ async def test_get_slate_lineup_dedupe_recs(self, slate_lineup_config):
                 {
                     "feed_id": 1,
                     "item_id": 10,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/3"
                 },
                 {
                     "feed_id": 1,
                     "item_id": 11,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/123"
                 },
             ]
         })
diff --git a/tests/functional/models/test_slate_model.py b/tests/functional/models/test_slate_model.py
index f5aeecfc5..6601b1c31 100644
--- a/tests/functional/models/test_slate_model.py
+++ b/tests/functional/models/test_slate_model.py
@@ -10,22 +10,26 @@
     {
         'feed_id': 1,
         'item_id': 3208490410,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/12"
     },
     {
         'feed_id': 1,
         'item_id': 32087704190,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/16"
     },
     {
         'feed_id': 12,
         'item_id': 32087904100,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/18"
     },
     {
         'feed_id': 2,
         'item_id': 32087904870,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/17"
     }
 ]
 
diff --git a/tests/unit/utils.py b/tests/unit/utils.py
index 1e98c6dad..aec317cf5 100644
--- a/tests/unit/utils.py
+++ b/tests/unit/utils.py
@@ -12,10 +12,10 @@ def generate_recommendations(item_ids: List[int or str]) -> List[RecommendationM
     for item_id in item_ids:
         rec = RecommendationModel(
             item_id=item_id,
-            item=ItemModel(item_id=item_id),
+            item=ItemModel(item_id=item_id, url="https://getpocket.com"),
             rec_src='bowling',
             feed_id=random.randint(0, 101),
-            id=random.randint(0, 101)
+            id=random.randint(0, 101),
         )
         rec.feed_item_id = id
         recs.append(rec)