Merge pull request #69 from jaydenchee97/feature

update workflow
jaydenchee97 · Sep 22, 2024 · 94c1f55 · 94c1f55
2 parents 51cf478 + 0cfa08b
commit 94c1f55
Show file tree

Hide file tree

Showing 16 changed files with 298 additions and 150 deletions.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
diff --git a/.github/workflows/sonar-cloud.yml → .github/workflows/sonar-scan.yml b/.github/workflows/sonar-cloud.yml → .github/workflows/sonar-scan.yml
@@ -37,18 +37,3 @@ jobs:
             -Dsonar.report.export.path=sonar-report.json 
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
-      - name: Fetch SonarCloud report
-        run: |
-          # Fetch the taskId
-          taskId=$(curl -u ${{ secrets.SONAR_TOKEN }}: "https://sonarcloud.io/api/ce/component?component=jaydenchee97_unirent" | jq -r '.currentTask.id')
-          # Fetch the analysisId from the task
-          analysisId=$(curl -u ${{ secrets.SONAR_TOKEN }}: "https://sonarcloud.io/api/ce/task?id=$taskId" | jq -r '.task.analysisId')
-          # Fetch the quality gate result
-          curl -u ${{ secrets.SONAR_TOKEN }}: "https://sonarcloud.io/api/qualitygates/project_status?analysisId=$analysisId" -o sonar-report.json
-
-      - name: Upload SonarCloud Report Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: sonarcloud-report
-          path: sonar-report.json 
diff --git a/App.tsx b/App.tsx
@@ -33,6 +33,7 @@ Amplify.configure({
 
 });
 
+
 // Amplify.configure({awsExports});
 
 export default function App() {
@@ -43,7 +44,7 @@ export default function App() {
         <NavigationContainer>
           <Authenticator.Provider>
               {/* <HomeStack /> */}
-              <AppStack />
+                <AppStack />
           </Authenticator.Provider>
           {/* <AppStack /> */}
 

diff --git a/amplify/README.md b/amplify/README.md
diff --git a/amplify/backend/api/unirent/schema.graphql b/amplify/backend/api/unirent/schema.graphql
@@ -49,6 +49,7 @@ type User @model @auth(rules: [{allow: public}]) {
   id: ID!
   name: String!
   status: String
+  userType: String
   Accommodations: [Accommodation] @hasMany(indexName: "byUser", fields: ["id"])
   ChatRooms: [ChatRoom] @manyToMany(relationName: "UserChatRoom")
   Messages: [Message] @hasMany(indexName: "byUser", fields: ["id"])

diff --git a/amplify/cli.json b/amplify/cli.json
@@ -1,63 +1,63 @@
 {
-  "features": {
-    "graphqltransformer": {
-      "addmissingownerfields": true,
-      "improvepluralization": false,
-      "validatetypenamereservedwords": true,
-      "useexperimentalpipelinedtransformer": true,
-      "enableiterativegsiupdates": true,
-      "secondarykeyasgsi": true,
-      "skipoverridemutationinputtypes": true,
-      "transformerversion": 2,
-      "suppressschemamigrationprompt": true,
-      "securityenhancementnotification": false,
-      "showfieldauthnotification": false,
-      "usesubusernamefordefaultidentityclaim": true,
-      "usefieldnameforprimarykeyconnectionfield": false,
-      "enableautoindexquerynames": true,
-      "respectprimarykeyattributesonconnectionfield": true,
-      "shoulddeepmergedirectiveconfigdefaults": false,
-      "populateownerfieldforstaticgroupauth": true
+    "features": {
+        "graphqltransformer": {
+            "addmissingownerfields": true,
+            "improvepluralization": false,
+            "validatetypenamereservedwords": true,
+            "useexperimentalpipelinedtransformer": true,
+            "enableiterativegsiupdates": true,
+            "secondarykeyasgsi": true,
+            "skipoverridemutationinputtypes": true,
+            "transformerversion": 2,
+            "suppressschemamigrationprompt": true,
+            "securityenhancementnotification": false,
+            "showfieldauthnotification": false,
+            "usesubusernamefordefaultidentityclaim": true,
+            "usefieldnameforprimarykeyconnectionfield": false,
+            "enableautoindexquerynames": true,
+            "respectprimarykeyattributesonconnectionfield": true,
+            "shoulddeepmergedirectiveconfigdefaults": false,
+            "populateownerfieldforstaticgroupauth": true
+        },
+        "frontend-ios": {
+            "enablexcodeintegration": true
+        },
+        "auth": {
+            "enablecaseinsensitivity": true,
+            "useinclusiveterminology": true,
+            "breakcirculardependency": true,
+            "forcealiasattributes": false,
+            "useenabledmfas": true
+        },
+        "codegen": {
+            "useappsyncmodelgenplugin": true,
+            "usedocsgeneratorplugin": true,
+            "usetypesgeneratorplugin": true,
+            "cleangeneratedmodelsdirectory": true,
+            "retaincasestyle": true,
+            "addtimestampfields": true,
+            "handlelistnullabilitytransparently": true,
+            "emitauthprovider": true,
+            "generateindexrules": true,
+            "enabledartnullsafety": true,
+            "generatemodelsforlazyloadandcustomselectionset": false
+        },
+        "appsync": {
+            "generategraphqlpermissions": true
+        },
+        "latestregionsupport": {
+            "pinpoint": 1,
+            "translate": 1,
+            "transcribe": 1,
+            "rekognition": 1,
+            "textract": 1,
+            "comprehend": 1
+        },
+        "project": {
+            "overrides": true
+        }
     },
-    "frontend-ios": {
-      "enablexcodeintegration": true
-    },
-    "auth": {
-      "enablecaseinsensitivity": true,
-      "useinclusiveterminology": true,
-      "breakcirculardependency": true,
-      "forcealiasattributes": false,
-      "useenabledmfas": true
-    },
-    "codegen": {
-      "useappsyncmodelgenplugin": true,
-      "usedocsgeneratorplugin": true,
-      "usetypesgeneratorplugin": true,
-      "cleangeneratedmodelsdirectory": true,
-      "retaincasestyle": true,
-      "addtimestampfields": true,
-      "handlelistnullabilitytransparently": true,
-      "emitauthprovider": true,
-      "generateindexrules": true,
-      "enabledartnullsafety": true,
-      "generatemodelsforlazyloadandcustomselectionset": false
-    },
-    "appsync": {
-      "generategraphqlpermissions": true
-    },
-    "latestregionsupport": {
-      "pinpoint": 1,
-      "translate": 1,
-      "transcribe": 1,
-      "rekognition": 1,
-      "textract": 1,
-      "comprehend": 1
-    },
-    "project": {
-      "overrides": true
+    "debug": {
+        "shareProjectConfig": false
     }
-  },
-  "debug": {
-    "shareProjectConfig": false
-  }
 }
diff --git a/amplify/hooks/README.md b/amplify/hooks/README.md
diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json
@@ -12,36 +12,35 @@
       "AmplifyAppId": "d3kjwk6i5to4jv"
     },
     "categories": {
-      "api": {
-        "unirent": {},
-        "accommodationApi": {},
-        "googleMapsApi": {},
-        "locationSearchApi": {}
-      },
       "auth": {
         "unirenta9aa32e0": {}
       },
       "function": {
-        "graphQlLambdaAuthorizerdd8bb286": {},
         "accommodationFunction": {
           "deploymentBucketName": "amplify-unirent-staging-195410-deployment",
           "s3Key": "amplify-builds/accommodationFunction-774f714152775a613331-build.zip"
         },
-        "recommendationHandler": {
-          "deploymentBucketName": "amplify-unirent-staging-195410-deployment",
-          "s3Key": "amplify-builds/recommendationHandler-32664c564d5a74436f6b-build.zip"
-        },
         "geocodingHandler": {
           "deploymentBucketName": "amplify-unirent-staging-195410-deployment",
           "s3Key": "amplify-builds/geocodingHandler-75696a48457143557734-build.zip"
         },
         "locationSearchApi": {
           "deploymentBucketName": "amplify-unirent-staging-195410-deployment",
           "s3Key": "amplify-builds/locationSearchApi-4b5633544e4938785253-build.zip"
+        },
+        "recommendationHandler": {
+          "deploymentBucketName": "amplify-unirent-staging-195410-deployment",
+          "s3Key": "amplify-builds/recommendationHandler-32664c564d5a74436f6b-build.zip"
         }
       },
       "storage": {
         "s3unirentstorage820c3fa6": {}
+      },
+      "api": {
+        "accommodationApi": {},
+        "googleMapsApi": {},
+        "locationSearchApi": {},
+        "unirent": {}
       }
     }
   }

diff --git a/src/graphql/API.ts b/src/graphql/API.ts
@@ -298,6 +298,7 @@ export type CreateUserInput = {
   id?: string | null,
   name: string,
   status?: string | null,
+  userType: string | null,
   userSavedAccommodationId?: string | null,
 };
 
@@ -314,6 +315,7 @@ export type UpdateUserInput = {
   id: string,
   name?: string | null,
   status?: string | null,
+  userType: string | null,
   userSavedAccommodationId?: string | null,
 };