Merge branch 'develop' of https://github.com/HUNG-rushb/Images-Social…

…-Server into develop

.env.example

@@ -4,4 +4,5 @@ IS_LOGGING=1
 # For tool generatePosts 
 AWS_ACCESS_KEY=
 AWS_SECRET_ACCESS=
-AWS_BUCKET_NAME=
+AWS_BUCKET_NAME=
+APP_ID=

src/Type_Definitions/User_User.js

@@ -1,6 +1,7 @@
 import gql from 'graphql-tag';
 import commonDefs from './Common_Common.js';
 import skillDefs from './Skill_Skill.js';
+import categoryDefs from './Category_Category.js';
 
 const userDefs = gql`
   extend type Query {
@@ -58,6 +59,8 @@ const userDefs = gql`
     addSkill(data: AddSkillInput!): User!
     endorseSkill(data: EndorseSkillInput!): User!
     unEndorseSkill(data: EndorseSkillInput!): User!
+    addInterestCategories(data: InterestCategoriesInput!): User!
+    removeInterestCategories(data: InterestCategoriesInput!): User!
   }
 
   input EndorseSkillInput {
@@ -74,9 +77,14 @@ const userDefs = gql`
     content: String!
   }
 
+  input InterestCategoriesInput {
+    userId: ID!
+    categoryIds: [String]!
+  }
+
   input AddSkillInput {
     userId: ID!
-    skillId: String!
+    skillIds: [String]!
   }
 
   input CreateUserInput {
@@ -130,7 +138,9 @@ const userDefs = gql`
 
     biography: String
     userEndorsements: [Endorsement]
+    interestCategories: [Category]
   }
+  ${categoryDefs}
 
   type Endorsement {
     id: ID!

src/prisma/schema.prisma

@@ -62,7 +62,9 @@ model User {
   endorsementIds      String[]      @db.ObjectId
   endorsements Endorsement[] @relation(name: "endorser", fields: [endorsementIds], references: [id])
 
-  
+  interestCategoryIds      String[]      @db.ObjectId
+  interestCategories Category[] @relation(name: "interest", fields: [interestCategoryIds], references: [id])
+
 }
 
 // model Notification {
@@ -172,6 +174,9 @@ model Category {
 
   stories            String[] @db.ObjectId
   category_to_story Story[]   @relation(fields: [stories], references: [id])
+  
+  interestUserIds String[] @db.ObjectId 
+  category_to_user User[]   @relation(name: "interest", fields: [interestUserIds], references: [id])
 }
 
 model Album {

src/resolvers/Mutation/profile.js

@@ -22,12 +22,12 @@ const profileMutation = {
 
   /**
    * @param {*} parent
-   * @param {{data: {skillId: string, userId: string}}} args
+   * @param {{data: {skillIds: string[], userId: string}}} args
    * @param {*} info
    * @returns
    */
   addSkill: async (parent, args, info) => {
-    const { skillId, userId } = args.data;
+    const { skillIds, userId } = args.data;
 
     const user = await prisma.user.findUnique({
       where: {
@@ -40,31 +40,49 @@ const profileMutation = {
     if (!user) {
       throw Error('User is not existed');
     }
-    const userSkillIds = user.user_to_endorsement.map((each) => each.skillId);
 
-    if (userSkillIds.includes(skillId)) {
-      throw Error('User has already added this skill');
+    const existedSkills = await prisma.skill.findMany({
+      where: {
+        id: {
+          in: skillIds,
+        },
+      },
+    });
+
+    if (existedSkills.length !== skillIds.length) {
+      throw Error('Some of skill not existed');
     }
 
+    const userSkillIds = user.user_to_endorsement.map((each) => each.skillId);
+
+    skillIds.forEach((id) => {
+      if (userSkillIds.includes(id)) {
+        throw Error('User has already added this skill');
+      }
+    });
+
     return await prisma.user.update({
       where: {
         id: userId,
       },
       data: {
         user_to_endorsement: {
-          create: {
-            skill: {
-              connect: {
-                id: skillId,
+          create: skillIds.map((id) => {
+            return {
+              skill: {
+                connect: {
+                  id: id,
+                },
               },
-            },
-          },
+            };
+          }),
         },
       },
     });
   },
 
-  /**
+  /**.map
+   *
    * @param {*} parent
    * @param {{data: {endorsementId: string, endorserUserId: string}}} args
    * @param {*} info
@@ -123,7 +141,7 @@ const profileMutation = {
         id: endorsementId,
       },
       data: {
-        endorsers: {
+        endorser: {
           connect: {
             id: endorserUserId,
           },

src/resolvers/Mutation/user.js

@@ -39,6 +39,8 @@ const userMutation = {
     }
     return user;
   },
+
+  // TODO: Update delele User that lead to all records relate to user also be deleted
   deleteUser: async (parent, args, info) => {
     let user;
     try {
@@ -85,6 +87,72 @@ const userMutation = {
 
     return updatedUser;
   },
+
+  /**
+   * @param {*} parent
+   * @param {{data: {categoryIds: string[], userId: string}}} args
+   * @param {*} info
+   * @returns
+   */
+  addInterestCategories: async (parent, args, info) => {
+    const { categoryIds, userId } = args.data;
+
+    const user = await prisma.user.findUnique({
+      where: {
+        id: userId,
+      },
+      include: {
+        interestCategories: true,
+      },
+    });
+    if (!user) {
+      throw Error('User is not existed');
+    }
+
+    categoryIds.forEach((id) => {
+      if (user.interestCategoryIds.includes(id)) {
+        throw Error('User has already added this category to interest');
+      }
+    });
+
+    const existedCategories = await prisma.category.findMany({
+      where: {
+        id: {
+          in: categoryIds,
+        },
+      },
+    });
+
+    if (existedCategories.length !== categoryIds.length) {
+      throw Error('Some of category not existed');
+    }
+
+    return await prisma.user.update({
+      where: {
+        id: userId,
+      },
+      data: {
+        interestCategories: {
+          connect: categoryIds.map((id) => {
+            return {
+              id: id,
+            };
+          }),
+        },
+      },
+    });
+  },
+
+  /**
+   * @param {*} parent
+   * @param {{data: {categoryIds: string, userId: string}}} args
+   * @param {*} info
+   * @returns
+   */
+  // Todo done this
+  removeInterestCategories: async (parent, args, info) => {
+    throw Error('Not implement yet');
+  },
 };
 
 export default userMutation;

src/resolvers/Type/User___.js

@@ -53,6 +53,16 @@ const User = {
       },
     });
   },
+
+  interestCategories: async (parent, args, info) => {
+    return await prisma.category.findMany({
+      where: {
+        interestUserIds: {
+          has: parent.id,
+        },
+      },
+    });
+  },
 };
 
 export default User;

tools/generatePosts/index.py

@@ -19,7 +19,19 @@ def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
 bucket_name = os.getenv("AWS_BUCKET_NAME")
 graphql_api_url = "http://localhost:4000/graphql"
 
-image_urls = ["https://picsum.photos"] * 100
+
+def getMockImageURLsMethodOne(count):
+    return ["https://picsum.photos"] * count
+
+
+def getMockImageURLsMethodTwo(count):
+    TOTAL = 873
+    MAX_LIMIT = 50
+    MIN_LIMIT = 5
+
+    url = "https://dummyapi.io/data/v1/post"
+    raise Exception("Not Complete yet")
+
 
 # Get user list from database
 current_user_list = [
@@ -112,8 +124,14 @@ def upload_images_to_s3(urls, bucket):
             print(f"Error uploading {url} to {bucket}: {str(e)}")
 
 
-t1 = threading.Thread(target=upload_images_to_s3, args=(image_urls, bucket_name))
-t2 = threading.Thread(target=upload_images_to_s3, args=(image_urls, bucket_name))
+t1 = threading.Thread(
+    target=upload_images_to_s3,
+    args=(getMockImageURLsMethodOne(50), bucket_name),
+)
+t2 = threading.Thread(
+    target=upload_images_to_s3,
+    args=(getMockImageURLsMethodOne(50), bucket_name),
+)
 
 t1.start()
 t2.start()