Android-SSD-Coders · mohnalkhateeb · Nov 30, 2021
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/amplify/backend/analytics/ThriftyOWUjV/parameters.json b/amplify/backend/analytics/ThriftyOWUjV/parameters.json
diff --git a/amplify/backend/analytics/ThriftyOWUjV/pinpoint-cloudformation-template.json b/amplify/backend/analytics/ThriftyOWUjV/pinpoint-cloudformation-template.json
diff --git a/amplify/backend/api/thrifty/cli-inputs.json b/amplify/backend/api/thrifty/cli-inputs.json
@@ -3,24 +3,24 @@
   "serviceConfiguration": {
     "serviceName": "AppSync",
     "defaultAuthType": {
-      "mode": "AMAZON_COGNITO_USER_POOLS",
-      "cognitoUserPoolId": "auththrifty21f6c364"
+      "mode": "API_KEY",
+      "keyDescription": "api key description",
+      "expirationTime": 30
     },
     "conflictResolution": {
       "defaultResolutionStrategy": {
         "type": "AUTOMERGE"
       }
     },
     "apiName": "thrifty",
-    "gqlSchemaPath": "/tmp/amplify-b38aed8f-cc0e-48c1-ab26-b93ee968bf10/amplify/backend/api/thrifty/schema.graphql",
+    "gqlSchemaPath": "/tmp/amplify-cd186b2f-6ea8-4974-9b5c-2a7e84c2f9a1/amplify/backend/api/thrifty/schema.graphql",
     "additionalAuthTypes": [
       {
-        "mode": "API_KEY",
-        "keyDescription": "api key description",
-        "expirationTime": 30
+        "mode": "AWS_IAM"
       },
       {
-        "mode": "AWS_IAM"
+        "mode": "AMAZON_COGNITO_USER_POOLS",
+        "cognitoUserPoolId": "auththrifty21f6c364"
       }
     ]
   }

diff --git a/amplify/backend/api/thrifty/parameters.json b/amplify/backend/api/thrifty/parameters.json
@@ -8,5 +8,5 @@
       "Outputs.UserPoolId"
     ]
   },
-  "AuthModeLastUpdated": "2021-11-28T17:20:48.071Z"
+  "AuthModeLastUpdated": "2021-11-30T18:21:20.057Z"
 }
diff --git a/amplify/backend/api/thrifty/resolvers/README.md b/amplify/backend/api/thrifty/resolvers/README.md
diff --git a/amplify/backend/api/thrifty/schema.graphql b/amplify/backend/api/thrifty/schema.graphql
@@ -1,17 +1,17 @@
-type Favorite @model @auth(rules: [{allow: private}]) @key(name: "byUser", fields: ["userID"]) {
+type Favorite @model @auth(rules: [{allow: public}]) @key(name: "byUser", fields: ["userID"]) {
   id: ID!
-  titleFav: String!
-  imageFav: String!
-  priceFav: String!
-  sizeFav: String!
-  categoryFav: String!
+  titleFav: String
+  imageFav: String
+  priceFav: String
+  sizeFav: String
+  categoryFav: String
   userID: ID
 }
 
 type User @model @auth(rules: [{allow: private}]) {
   id: ID!
   email: String!
-  Favorite: [Favorite] @connection(keyName: "byUser", fields: ["id"])
+  Favorites: [Favorite] @connection(keyName: "byUser", fields: ["id"])
 }
 
 type Category @model @auth(rules: [{allow: private}]) {

diff --git a/amplify/backend/api/thrifty/stacks/CustomResources.json b/amplify/backend/api/thrifty/stacks/CustomResources.json
diff --git a/amplify/backend/api/thrifty/transform.conf.json b/amplify/backend/api/thrifty/transform.conf.json
diff --git a/amplify/backend/auth/thrifty21f6c364/parameters.json b/amplify/backend/auth/thrifty21f6c364/parameters.json
diff --git a/amplify/backend/auth/thrifty21f6c364/thrifty21f6c364-cloudformation-template.yml b/amplify/backend/auth/thrifty21f6c364/thrifty21f6c364-cloudformation-template.yml
diff --git a/amplify/backend/backend-config.json b/amplify/backend/backend-config.json
@@ -6,21 +6,21 @@
             "output": {
                 "authConfig": {
                     "defaultAuthentication": {
-                        "authenticationType": "AMAZON_COGNITO_USER_POOLS",
-                        "userPoolConfig": {
-                            "userPoolId": "auththrifty21f6c364"
+                        "authenticationType": "API_KEY",
+                        "apiKeyConfig": {
+                            "apiKeyExpirationDays": 30,
+                            "description": "api key description"
                         }
                     },
                     "additionalAuthenticationProviders": [
                         {
-                            "authenticationType": "API_KEY",
-                            "apiKeyConfig": {
-                                "apiKeyExpirationDays": 30,
-                                "description": "api key description"
-                            }
+                            "authenticationType": "AWS_IAM"
                         },
                         {
-                            "authenticationType": "AWS_IAM"
+                            "authenticationType": "AMAZON_COGNITO_USER_POOLS",
+                            "userPoolConfig": {
+                                "userPoolId": "auththrifty21f6c364"
+                            }
                         }
                     ]
                 }

diff --git a/amplify/backend/storage/SSDStorage/parameters.json b/amplify/backend/storage/SSDStorage/parameters.json
diff --git a/amplify/backend/storage/SSDStorage/s3-cloudformation-template.json b/amplify/backend/storage/SSDStorage/s3-cloudformation-template.json
diff --git a/amplify/backend/storage/SSDStorage/storage-params.json b/amplify/backend/storage/SSDStorage/storage-params.json
diff --git a/amplify/backend/tags.json b/amplify/backend/tags.json
diff --git a/amplify/cli.json b/amplify/cli.json
diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java
@@ -13,7 +13,7 @@
  */
 
 public final class AmplifyModelProvider implements ModelProvider {
-  private static final String AMPLIFY_MODEL_VERSION = "1c29971a13d9fcd249685dddf076b501";
+  private static final String AMPLIFY_MODEL_VERSION = "c4420d7929c8b813762fc983af3c5c7f";
   private static AmplifyModelProvider amplifyGeneratedModelInstance;
   private AmplifyModelProvider() {
 

diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/Category.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/Category.java
@@ -1,6 +1,5 @@
 package com.amplifyframework.datastore.generated.model;
 
-import com.amplifyframework.core.model.annotations.HasMany;
 import com.amplifyframework.core.model.temporal.Temporal;
 
 import java.util.List;
@@ -30,7 +29,6 @@ public final class Category implements Model {
   public static final QueryField NAME = field("Category", "name");
   private final @ModelField(targetType="ID", isRequired = true) String id;
   private final @ModelField(targetType="String", isRequired = true) String name;
-  private final @ModelField(targetType="Product") @HasMany(associatedWith = "categoryID", type = Product.class) List<Product> Products = null;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime createdAt;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime updatedAt;
   public String getId() {
@@ -41,10 +39,6 @@ public String getName() {
       return name;
   }
 
-  public List<Product> getProducts() {
-      return Products;
-  }
-
   public Temporal.DateTime getCreatedAt() {
       return createdAt;
   }

diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/Favorite.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/Favorite.java
@@ -22,7 +22,7 @@
 /** This is an auto generated class representing the Favorite type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "Favorites", authRules = {
-  @AuthRule(allow = AuthStrategy.PRIVATE, operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
+  @AuthRule(allow = AuthStrategy.PUBLIC, operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 @Index(name = "byUser", fields = {"userID"})
 public final class Favorite implements Model {
@@ -34,11 +34,11 @@ public final class Favorite implements Model {
   public static final QueryField CATEGORY_FAV = field("Favorite", "categoryFav");
   public static final QueryField USER_ID = field("Favorite", "userID");
   private final @ModelField(targetType="ID", isRequired = true) String id;
-  private final @ModelField(targetType="String", isRequired = true) String titleFav;
-  private final @ModelField(targetType="String", isRequired = true) String imageFav;
-  private final @ModelField(targetType="String", isRequired = true) String priceFav;
-  private final @ModelField(targetType="String", isRequired = true) String sizeFav;
-  private final @ModelField(targetType="String", isRequired = true) String categoryFav;
+  private final @ModelField(targetType="String") String titleFav;
+  private final @ModelField(targetType="String") String imageFav;
+  private final @ModelField(targetType="String") String priceFav;
+  private final @ModelField(targetType="String") String sizeFav;
+  private final @ModelField(targetType="String") String categoryFav;
   private final @ModelField(targetType="ID") String userID;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime createdAt;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime updatedAt;
@@ -141,7 +141,7 @@ public String toString() {
       .toString();
   }
 
-  public static TitleFavStep builder() {
+  public static BuildStep builder() {
       return new Builder();
   }
 
@@ -174,39 +174,19 @@ public CopyOfBuilder copyOfBuilder() {
       categoryFav,
       userID);
   }
-  public interface TitleFavStep {
-    ImageFavStep titleFav(String titleFav);
-  }
-
-
-  public interface ImageFavStep {
-    PriceFavStep imageFav(String imageFav);
-  }
-
-
-  public interface PriceFavStep {
-    SizeFavStep priceFav(String priceFav);
-  }
-
-
-  public interface SizeFavStep {
-    CategoryFavStep sizeFav(String sizeFav);
-  }
-
-
-  public interface CategoryFavStep {
-    BuildStep categoryFav(String categoryFav);
-  }
-
-
   public interface BuildStep {
     Favorite build();
     BuildStep id(String id);
+    BuildStep titleFav(String titleFav);
+    BuildStep imageFav(String imageFav);
+    BuildStep priceFav(String priceFav);
+    BuildStep sizeFav(String sizeFav);
+    BuildStep categoryFav(String categoryFav);
     BuildStep userId(String userId);
   }
 
 
-  public static class Builder implements TitleFavStep, ImageFavStep, PriceFavStep, SizeFavStep, CategoryFavStep, BuildStep {
+  public static class Builder implements BuildStep {
     private String id;
     private String titleFav;
     private String imageFav;
@@ -229,36 +209,31 @@ public Favorite build() {
     }
 
     @Override
-     public ImageFavStep titleFav(String titleFav) {
-        Objects.requireNonNull(titleFav);
+     public BuildStep titleFav(String titleFav) {
         this.titleFav = titleFav;
         return this;
     }
 
     @Override
-     public PriceFavStep imageFav(String imageFav) {
-        Objects.requireNonNull(imageFav);
+     public BuildStep imageFav(String imageFav) {
         this.imageFav = imageFav;
         return this;
     }
 
     @Override
-     public SizeFavStep priceFav(String priceFav) {
-        Objects.requireNonNull(priceFav);
+     public BuildStep priceFav(String priceFav) {
         this.priceFav = priceFav;
         return this;
     }
 
     @Override
-     public CategoryFavStep sizeFav(String sizeFav) {
-        Objects.requireNonNull(sizeFav);
+     public BuildStep sizeFav(String sizeFav) {
         this.sizeFav = sizeFav;
         return this;
     }
 
     @Override
      public BuildStep categoryFav(String categoryFav) {
-        Objects.requireNonNull(categoryFav);
         this.categoryFav = categoryFav;
         return this;
     }

diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/User.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/User.java
@@ -1,6 +1,5 @@
 package com.amplifyframework.datastore.generated.model;
 
-import com.amplifyframework.core.model.annotations.HasMany;
 import com.amplifyframework.core.model.temporal.Temporal;
 
 import java.util.List;
@@ -30,7 +29,6 @@ public final class User implements Model {
   public static final QueryField EMAIL = field("User", "email");
   private final @ModelField(targetType="ID", isRequired = true) String id;
   private final @ModelField(targetType="String", isRequired = true) String email;
-  private final @ModelField(targetType="Favorite") @HasMany(associatedWith = "userID", type = Favorite.class) List<Favorite> Favorite = null;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime createdAt;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime updatedAt;
   public String getId() {
@@ -41,10 +39,6 @@ public String getEmail() {
       return email;
   }
 
-  public List<Favorite> getFavorite() {
-      return Favorite;
-  }
-
   public Temporal.DateTime getCreatedAt() {
       return createdAt;
   }

diff --git a/app/src/main/java/com/example/thrifty/WomenClothes.java b/app/src/main/java/com/example/thrifty/WomenClothes.java
@@ -59,6 +59,8 @@ public boolean handleMessage(@NonNull Message msg) {
                     categorizedHandler.sendEmptyMessage(1);
                 }, error -> Log.e("MyAmplifyApp", "Query failure", error)
         );
+        //******************************
+        //**************************
 
     }
 }