Merge branch 'feature/orgApplication' into develop

amplify/backend/api/piggybankofhappiness/schema/ApplicationOrganization.graphql

@@ -0,0 +1,38 @@
+type ApplicationOrganization
+  @model
+  @key(name: "byStatusByUpdate", fields: ["status", "updatedAt"], queryField: "getApplicationByStatusByUpdate")
+  @auth(rules: [
+    {allow: owner, ownerField: "username", operations: [read]},
+    {allow: groups, groups: ["AppAdmins"]},
+  ])
+{
+  id: ID!
+  username: String! # 機構負責人帳號
+
+  name: String! # 機構名稱
+  registeredName: String! # 政府立案名稱
+  taxIdNumber: String! # 統一編號
+  description: String! #  描述
+  phoneNumber: String!
+  email: String!
+  address: Address!
+
+  comments: [ApplicationOrganizationComment]
+
+  status: ApplicationOrganizationStatus!
+  createdAt: AWSDateTime!
+  updatedAt: AWSDateTime!
+}
+
+enum ApplicationOrganizationStatus {
+  Pending
+  Waiting For Additional Documents
+  Approved
+  Rejected
+}
+
+type ApplicationOrganizationComment {
+  createdAt: AWSDateTime!
+  createdBy: String!
+  comment: String!
+}

amplify/backend/api/piggybankofhappiness/schema/Organization.graphql

@@ -9,6 +9,13 @@ type Organization
   id: ID!
   name: String!
   description: String!
+  # from application
+  registeredName: String
+  taxIdNumber: String
+  phoneNumber: String
+  email: String
+  address: Address
+
   isActive: Int!
   createdAt: AWSDateTime!
   updatedAt: AWSDateTime!

amplify/backend/api/piggybankofhappiness/schema/Types.graphql

@@ -20,4 +20,11 @@ enum TaskStatusType {
   In progress
   Completed
   Failed
+}
+
+type Address {
+  county: String! # 台北市
+  district: String! # 信義區
+  street: String! # 市府路45號
+  zipCode: String! # 11060
 }

mobile/app.json

@@ -25,7 +25,7 @@
     "ios": {
       "usesAppleSignIn": true,
       "supportsTablet": true,
-      "buildNumber": "45",
+      "buildNumber": "47",
       "bundleIdentifier": "cloud.goldax.piggy-bank-of-happiness",
       "infoPlist": {}
     },