Merge pull request #369 from consensusnetworks/update/user-schema

Update/user schema
consensusnetworks · Jul 6, 2023 · 4197640 · 4197640
2 parents 5f12c3b + b7b7779
commit 4197640
Show file tree

Hide file tree

Showing 9 changed files with 311 additions and 237 deletions.
diff --git a/apps/web/src/composables/users.ts b/apps/web/src/composables/users.ts
@@ -326,6 +326,17 @@ export default function useUsers () {
         return await fetch(`${usersBaseURL}/user/update-primary-account`, requestOptions)
     }
 
+    async function updateUserAgreement(agreed: boolean) {
+        const requestOptions = {
+            method: 'PUT',
+            headers: { 
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ agreed })
+        }
+        return await fetch(`${usersBaseURL}/user/update-user-agreement/${user.value?.id}`, requestOptions)
+    }
+
     return {
         session,
         user: readonly(user),
@@ -341,6 +352,7 @@ export default function useUsers () {
         removeAccount,
         setUser,
         setUserAccountBalances,
-        updatePrimaryAddress
+        updatePrimaryAddress,
+        updateUserAgreement
     }
 }
diff --git a/apps/web/src/pages/overview/components/Staking.vue b/apps/web/src/pages/overview/components/Staking.vue
@@ -11,7 +11,7 @@ import TermsOfService from '@/components/TermsOfService.vue'
 
 const { deposit, getDepositFees } = useContracts()
 const { getEthersBalance } = useEthers()
-const { user } = useUsers()
+const { user, updateUserAgreement } = useUsers()
 const { getCurrentPrice } = usePrice()
 
 const selectedProvider = ref<ProviderString>('')
@@ -140,6 +140,8 @@ watch(formattedAmountToStake, async () => {
 
 watch(user, () => {
   aggregateAddressesByProvider()
+  termsOfServiceCheckbox.value = user.value?.agreedToTermsOfService as boolean
+  console.log('user.value.agreedToTermsOfService :>> ', user.value?.agreedToTermsOfService)
 })
 
 onMounted(async () => {
@@ -344,6 +346,7 @@ const handleDeposit = async () => {
         v-model="termsOfServiceCheckbox"
         type="checkbox"
         class="card_checkbox"
+        @change="updateUserAgreement(termsOfServiceCheckbox)"
       > 
       <button
         id="termsOfServiceButton"

diff --git a/common/data/src/interfaces/JsonSchema.ts b/common/data/src/interfaces/JsonSchema.ts
@@ -6,7 +6,8 @@ export interface JsonSchema {
     properties: {
         [key: string]: {
             type: string,
-            description: string
+            description: string,
+            default: string | number | boolean | null
         }
     },
     uniqueFields?: string[],

diff --git a/common/data/src/providers/schema.ts b/common/data/src/providers/schema.ts
@@ -84,7 +84,10 @@ export class Schema {
 
             const comment = property.description
             if (comment.includes('PK')) column += ' PRIMARY KEY'
-
+
+            const defaultValue = property.default
+            if (defaultValue !== undefined) column += ` DEFAULT ${defaultValue}`
+
             return column
         })
 

diff --git a/common/data/src/schemas/user.schema.json b/common/data/src/schemas/user.schema.json
@@ -20,6 +20,11 @@
             "type": "string",
             "description": "The account last update date in ISO 8601 format"
         },
+        "agreed_to_terms_of_service": {
+            "type": "boolean",
+            "description": "The user aggreement status",
+            "default": false
+        },
         "wallet_provider": {
             "type": "string",
             "description": "The wallet provider used set a primary user account"
@@ -30,6 +35,7 @@
         "created_at",
         "id",
         "updated_at",
+        "user_aggreement",
         "wallet_provider"
     ]
 }
diff --git a/common/types/src/interfaces/User.ts b/common/types/src/interfaces/User.ts
@@ -12,6 +12,8 @@ export interface User {
     id: number
     /* ISO Timestamp of when user was last updated */
     updatedAt?: string
+    /* Did user agree to terms of service? */
+    agreedToTermsOfService: boolean
     /* Wallet provider (e.g. metamask) */
     walletProvider: ProviderString
 }