From bc8197c0b5d07051a8cce8a42eed6980569b6ed5 Mon Sep 17 00:00:00 2001
From: Sumit Aggarwal <113253832+sam5102@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:34:39 +0530
Subject: [PATCH] Revert "Added cityId for subscription."

---
 .../flickmatch/platform/dynamodb/model/Subscription.java | 9 ---------
 .../platform/graphql/builder/SubscriptionBuilder.java    | 2 --
 .../flickmatch/platform/graphql/type/Subscription.java   | 2 +-
 platform/src/main/resources/graphql/schema.graphqls      | 1 -
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/platform/src/main/java/com/flickmatch/platform/dynamodb/model/Subscription.java b/platform/src/main/java/com/flickmatch/platform/dynamodb/model/Subscription.java
index 98ee3abc..b874f396 100644
--- a/platform/src/main/java/com/flickmatch/platform/dynamodb/model/Subscription.java
+++ b/platform/src/main/java/com/flickmatch/platform/dynamodb/model/Subscription.java
@@ -43,7 +43,6 @@ public void setSubscriptionId(String subscriptionId) {
     private Integer gamesLeft;
 
     private String expiryDate;
-    private String cityId;
 
     public String getStatus() {
         return status;
@@ -77,14 +76,6 @@ public void setExpiryDate(String expiryDate) {
         this.expiryDate = expiryDate;
     }
 
-    public String getCityId() {
-        return cityId;
-    }
-
-    public void setCityId(String cityId) {
-        this.cityId = cityId;
-    }
-
     // This is a composite key made up of userId and subscriptionId
     @Id
     private SubscriptionKey subscriptionKey;
diff --git a/platform/src/main/java/com/flickmatch/platform/graphql/builder/SubscriptionBuilder.java b/platform/src/main/java/com/flickmatch/platform/graphql/builder/SubscriptionBuilder.java
index 29f116b7..fc213de3 100644
--- a/platform/src/main/java/com/flickmatch/platform/graphql/builder/SubscriptionBuilder.java
+++ b/platform/src/main/java/com/flickmatch/platform/graphql/builder/SubscriptionBuilder.java
@@ -72,7 +72,6 @@ public MutationResult createSubscription(String email, String passId) {
                     .gamesLeft(gamesLeft)
                     .status("Active")
                     .expiryDate(expiryDate)
-                    .cityId(pass.getCityId())
                     .build();
 
             log.error(subscription.toString());
@@ -157,7 +156,6 @@ com.flickmatch.platform.graphql.type.Subscription mapEventToGQLType(Subscription
                 .expiryDate(subs.getExpiryDate())
                 .gamesLeft(subs.getGamesLeft())
                 .status(subs.getStatus())
-                .cityId(subs.getCityId())
                 .build();
     }
 
diff --git a/platform/src/main/java/com/flickmatch/platform/graphql/type/Subscription.java b/platform/src/main/java/com/flickmatch/platform/graphql/type/Subscription.java
index 31cb7785..d6068cca 100644
--- a/platform/src/main/java/com/flickmatch/platform/graphql/type/Subscription.java
+++ b/platform/src/main/java/com/flickmatch/platform/graphql/type/Subscription.java
@@ -13,6 +13,6 @@ public class Subscription {
     private String passId;
     private String userId;
     private Integer gamesLeft;
-    private String cityId;
+
     private String expiryDate;
 }
diff --git a/platform/src/main/resources/graphql/schema.graphqls b/platform/src/main/resources/graphql/schema.graphqls
index 70a772b8..c0953e0c 100644
--- a/platform/src/main/resources/graphql/schema.graphqls
+++ b/platform/src/main/resources/graphql/schema.graphqls
@@ -105,7 +105,6 @@ type Subscription {
   expiryDate: String!
   gamesLeft: Int!
   status: String!
-  cityId: String!
 }
 
 type Pass {