Merge pull request #399 from Oloodi/398-enhance-dataconnect-address-fields-in-schemas-for-google-maps-validation

adding new fields for address validation of google

backend/dataconnect/connector/business/mutations.gql

@@ -7,7 +7,14 @@ mutation createBusiness(
   $email: String,
   $hubBuilding: String,
   $address: String,
+  $placeId: String,
+  $latitude: Float,
+  $longitude: Float,
   $city: String,
+  $state: String,
+  $street: String,
+  $country: String,
+  $zipCode: String,
   $area: BusinessArea,
   $sector: BusinessSector,
   $rateGroup: BusinessRateGroup!,
@@ -24,7 +31,14 @@ mutation createBusiness(
       email: $email,
       hubBuilding: $hubBuilding,
       address: $address,
+      placeId: $placeId,
+      latitude: $latitude,
+      longitude: $longitude,
       city: $city,
+      state: $state,
+      street: $street,
+      country: $country,
+      zipCode: $zipCode,
       area: $area,
       sector: $sector,
       rateGroup: $rateGroup,
@@ -43,7 +57,14 @@ mutation updateBusiness(
   $email: String,
   $hubBuilding: String,
   $address: String,
+  $placeId: String,
+  $latitude: Float,
+  $longitude: Float,
   $city: String,
+  $state: String,
+  $street: String,
+  $country: String,
+  $zipCode: String,
   $area: BusinessArea,
   $sector: BusinessSector,
   $rateGroup: BusinessRateGroup,
@@ -60,7 +81,14 @@ mutation updateBusiness(
       email: $email,
       hubBuilding: $hubBuilding,
       address: $address,
+      placeId: $placeId,
+      latitude: $latitude,
+      longitude: $longitude,
       city: $city,
+      state: $state,
+      street: $street,
+      country: $country,
+      zipCode: $zipCode,
       area: $area,
       sector: $sector,
       rateGroup: $rateGroup,
@@ -72,4 +100,4 @@ mutation updateBusiness(
 
 mutation deleteBusiness($id: UUID!) @auth(level: USER) {
   business_delete(id: $id) 
-}
+}

backend/dataconnect/connector/business/queries.gql

@@ -9,7 +9,14 @@ query listBusinesses @auth(level: USER) {
     email
     hubBuilding
     address
+    placeId
+    latitude
+    longitude
     city
+    state
+    street
+    country
+    zipCode
     area
     sector
     rateGroup
@@ -31,7 +38,14 @@ query getBusinessesByUserId($userId: String!) @auth(level: USER) {
     email
     hubBuilding
     address
+    placeId
+    latitude
+    longitude
     city
+    state
+    street
+    country
+    zipCode
     area
     sector
     rateGroup
@@ -53,7 +67,14 @@ query getBusinessById($id: UUID!) @auth(level: USER) {
     email
     hubBuilding
     address
+    placeId
+    latitude
+    longitude
     city
+    state
+    street
+    country
+    zipCode
     area
     sector
     rateGroup
@@ -62,4 +83,4 @@ query getBusinessById($id: UUID!) @auth(level: USER) {
     createdAt
     updatedAt
   }
-}
+}

backend/dataconnect/connector/staff/mutations.gql

@@ -40,6 +40,13 @@ mutation CreateStaff(
   $englishRequired: Boolean
   $city: String
   $addres: String
+  $placeId: String
+  $latitude: Float
+  $longitude: Float
+  $state: String
+  $street: String
+  $country: String
+  $zipCode: String
 ) @auth(level: USER) {
   staff_insert(
     data: {
@@ -82,6 +89,13 @@ mutation CreateStaff(
       englishRequired: $englishRequired
       city: $city
       addres: $addres
+      placeId: $placeId
+      latitude: $latitude
+      longitude: $longitude
+      state: $state
+      street: $street
+      country: $country
+      zipCode: $zipCode
 
     }
   ) 
@@ -131,6 +145,13 @@ mutation UpdateStaff(
   $englishRequired: Boolean
   $city: String
   $addres: String
+  $placeId: String
+  $latitude: Float
+  $longitude: Float
+  $state: String
+  $street: String
+  $country: String
+  $zipCode: String
 ) @auth(level: USER) {
   staff_update(
     id: $id
@@ -174,6 +195,13 @@ mutation UpdateStaff(
       englishRequired: $englishRequired
       city: $city
       addres: $addres
+      placeId: $placeId
+      latitude: $latitude
+      longitude: $longitude
+      state: $state
+      street: $street
+      country: $country
+      zipCode: $zipCode
 
     }
   ) 

backend/dataconnect/connector/staff/queries.gql

@@ -40,6 +40,13 @@ query listStaff @auth(level: USER) {
     englishRequired
     city
     addres
+    placeId
+    latitude
+    longitude
+    state
+    street
+    country
+    zipCode
   }
 }
 
@@ -87,6 +94,13 @@ query getStaffById($id: UUID!) @auth(level: USER) {
     englishRequired
     city
     addres
+    placeId
+    latitude
+    longitude
+    state
+    street
+    country
+    zipCode
   }
 }
 
@@ -133,6 +147,13 @@ query getStaffByUserId($userId: String!) @auth(level: USER) {
     englishRequired
     city
     addres
+    placeId
+    latitude
+    longitude
+    state
+    street
+    country
+    zipCode
   }
 }
 
@@ -170,5 +191,12 @@ query filterStaff(
     englishRequired
     city
     addres
+    placeId
+    latitude
+    longitude
+    state
+    street
+    country
+    zipCode
   }
 }

backend/dataconnect/connector/taxForm/mutations.gql

@@ -9,9 +9,14 @@ mutation createTaxForm(
   $email: String
   $phone: String
   $address: String!
+  $placeId: String
+  $latitude: Float
+  $longitude: Float
   $city: String
   $apt: String
   $state: String
+  $street: String
+  $country: String
   $zipCode: String
 
   # W-4
@@ -51,9 +56,14 @@ mutation createTaxForm(
       email: $email
       phone: $phone
       address: $address
+      placeId: $placeId
+      latitude: $latitude
+      longitude: $longitude
       city: $city
       apt: $apt
       state: $state
+      street: $street
+      country: $country
       zipCode: $zipCode
 
       marital: $marital
@@ -94,9 +104,14 @@ mutation updateTaxForm(
   $email: String
   $phone: String
   $address: String
+  $placeId: String
+  $latitude: Float
+  $longitude: Float
   $city: String
   $apt: String
   $state: String
+  $street: String
+  $country: String
   $zipCode: String
 
   # W-4
@@ -136,9 +151,14 @@ mutation updateTaxForm(
       email: $email
       phone: $phone
       address: $address
+      placeId: $placeId
+      latitude: $latitude
+      longitude: $longitude
       city: $city
       apt: $apt
       state: $state
+      street: $street
+      country: $country
       zipCode: $zipCode
 
       marital: $marital

backend/dataconnect/connector/taxForm/queries.gql

@@ -17,7 +17,12 @@ query listTaxForms($offset: Int, $limit: Int) @auth(level: USER) {
     email
     phone
     address
+    placeId
+    latitude
+    longitude
     city
+    street
+    country
     apt
     state
     zipCode
@@ -61,7 +66,12 @@ query getTaxFormById($id: UUID!) @auth(level: USER) {
     email
     phone
     address
+    placeId
+    latitude
+    longitude
     city
+    street
+    country
     apt
     state
     zipCode
@@ -114,7 +124,12 @@ query getTaxFormsByStaffId(
     email
     phone
     address
+    placeId
+    latitude
+    longitude
     city
+    street
+    country
     apt
     state
     zipCode
@@ -173,7 +188,12 @@ query listTaxFormsWhere(
     email
     phone
     address
+    placeId
+    latitude
+    longitude
     city
+    street
+    country
     apt
     state
     zipCode

backend/dataconnect/connector/vendor/mutations.gql

@@ -5,6 +5,12 @@ mutation createVendor(
   $phone: String
   $photoUrl: String
   $address: String
+  $placeId: String
+  $latitude: Float
+  $longitude: Float
+  $street: String
+  $country: String
+  $zipCode: String
   $billingAddress: String
   $timezone: String
   $legalName: String
@@ -28,6 +34,12 @@ mutation createVendor(
       phone: $phone
       photoUrl: $photoUrl
       address: $address
+      placeId: $placeId
+      latitude: $latitude
+      longitude: $longitude
+      street: $street
+      country: $country
+      zipCode: $zipCode
       billingAddress: $billingAddress
       timezone: $timezone
       legalName: $legalName
@@ -53,6 +65,12 @@ mutation updateVendor(
   $phone: String
   $photoUrl: String
   $address: String
+  $placeId: String
+  $latitude: Float
+  $longitude: Float
+  $street: String
+  $country: String
+  $zipCode: String
   $billingAddress: String
   $timezone: String
   $legalName: String
@@ -76,6 +94,12 @@ mutation updateVendor(
       phone: $phone
       photoUrl: $photoUrl
       address: $address
+      placeId: $placeId
+      latitude: $latitude
+      longitude: $longitude
+      street: $street
+      country: $country
+      zipCode: $zipCode
       billingAddress: $billingAddress
       timezone: $timezone
       legalName: $legalName

backend/dataconnect/connector/vendor/queries.gql

@@ -7,6 +7,12 @@ query getVendorById($id: UUID!) @auth(level: USER) {
     phone
     photoUrl
     address
+    placeId
+    latitude
+    longitude
+    street
+    country
+    zipCode
     billingAddress
     timezone
     legalName
@@ -36,6 +42,12 @@ query getVendorByUserId($userId: String!) @auth(level: USER) {
     phone
     photoUrl
     address
+    placeId
+    latitude
+    longitude
+    street
+    country
+    zipCode
     billingAddress
     timezone
     legalName
@@ -65,6 +77,12 @@ query listVendors @auth(level: USER) {
     phone
     photoUrl
     address
+    placeId
+    latitude
+    longitude
+    street
+    country
+    zipCode
     billingAddress
     timezone
     legalName

backend/dataconnect/schema/business.gql

@@ -38,8 +38,18 @@ type Business @table(name: "businesses") {
   phone: String
   email: String
   hubBuilding: String
+
   address: String
+  placeId: String
+  latitude: Float
+  longitude: Float
   city: String
+  state: String
+  street: String
+  country: String
+  zipCode: String
+
+
   area: BusinessArea
   sector: BusinessSector
   rateGroup: BusinessRateGroup!

backend/dataconnect/schema/staff.gql

@@ -84,8 +84,17 @@ type Staff @table(name: "staffs") {
   employmentType: EmploymentType
   initial: String
   englishRequired: Boolean @default(expr: "false")
-  city: String
+ 
   addres: String
+  placeId: String
+  latitude: Float
+  longitude: Float
+
+  city: String
+  state: String
+  street: String
+  country: String
+  zipCode: String
 
   createdAt: Timestamp @default(expr: "request.time")
   updatedAt: Timestamp @default(expr: "request.time")

backend/dataconnect/schema/taxForm.gql

@@ -36,11 +36,17 @@ type TaxForm @table(name: "tax_forms") {
   socialSN: Int!
   email: String
   phone: String
+
   address: String!
+  placeId: String
+  latitude: Float
+  longitude: Float
   city: String
-  apt: String
   state: String
+  street: String
+  country: String
   zipCode: String
+  apt: String
 
   # form W-4
   marital: MaritalStatus

backend/dataconnect/schema/vendor.gql

@@ -18,14 +18,24 @@ type Vendor @table(name: "vendors") {
   email: String
   phone: String
   photoUrl: String
+  
   address: String
+  placeId: String
+  latitude: Float
+  longitude: Float
+  city: String
+  state: String
+  street: String
+  country: String
+  zipCode: String
+
   billingAddress: String
   timezone: String @default(expr: "'UTC'")
   legalName: String
   doingBusinessAs: String
   region: String
-  state: String
-  city: String
+  #state: String
+  #city: String
   serviceSpecialty: String
   approvalStatus: ApprovalStatus
   isActive: Boolean