From 30273f19544b3fa5d9a291ff43d3340467aa80de Mon Sep 17 00:00:00 2001
From: John Huang <little78926@gmail.com>
Date: Sat, 12 Sep 2020 14:03:08 -0700
Subject: [PATCH 1/2] Update db

---
 .../schema/ApplicationOrganization.graphql    | 38 +++++++++++++++++++
 .../schema/Organization.graphql               |  7 ++++
 .../piggybankofhappiness/schema/Types.graphql |  7 ++++
 3 files changed, 52 insertions(+)
 create mode 100644 amplify/backend/api/piggybankofhappiness/schema/ApplicationOrganization.graphql

diff --git a/amplify/backend/api/piggybankofhappiness/schema/ApplicationOrganization.graphql b/amplify/backend/api/piggybankofhappiness/schema/ApplicationOrganization.graphql
new file mode 100644
index 0000000..dd455aa
--- /dev/null
+++ b/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!
+}
\ No newline at end of file
diff --git a/amplify/backend/api/piggybankofhappiness/schema/Organization.graphql b/amplify/backend/api/piggybankofhappiness/schema/Organization.graphql
index 8c86379..eab934b 100644
--- a/amplify/backend/api/piggybankofhappiness/schema/Organization.graphql
+++ b/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!
diff --git a/amplify/backend/api/piggybankofhappiness/schema/Types.graphql b/amplify/backend/api/piggybankofhappiness/schema/Types.graphql
index daec5eb..0da8c18 100644
--- a/amplify/backend/api/piggybankofhappiness/schema/Types.graphql
+++ b/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
 }
\ No newline at end of file

From 24a04e8a4e9160dd2d671f643c6693b8759b0185 Mon Sep 17 00:00:00 2001
From: John Huang <little78926@gmail.com>
Date: Sun, 13 Sep 2020 17:29:20 -0700
Subject: [PATCH 2/2] bump ios build version

---
 mobile/app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/app.json b/mobile/app.json
index 2586cf0..019fe62 100644
--- a/mobile/app.json
+++ b/mobile/app.json
@@ -25,7 +25,7 @@
     "ios": {
       "usesAppleSignIn": true,
       "supportsTablet": true,
-      "buildNumber": "45",
+      "buildNumber": "47",
       "bundleIdentifier": "cloud.goldax.piggy-bank-of-happiness",
       "infoPlist": {}
     },