From c8d940857f7781e1393c1093f92b0fb044fc3208 Mon Sep 17 00:00:00 2001
From: Wattana Chaidee <wchaidee@gmail.com>
Date: Fri, 9 Feb 2024 12:27:51 +0700
Subject: [PATCH] #179 #176 #175 add user address field.

---
 components/admin/profile/updateInfo.tsx       | 14 +++
 .../admin/profile/updateInfoViewModel.ts      | 18 +++-
 components/admin/user/create.tsx              | 11 +++
 components/admin/user/createViewModel.ts      |  1 +
 components/admin/user/update.tsx              | 25 +++++
 components/admin/user/updateViewModel.ts      |  2 +
 components/admin/user/userViewModel.ts        | 14 +++
 components/admin/user/view.tsx                |  9 ++
 components/auth/register/index.tsx            |  2 +-
 components/auth/register/registerUser.tsx     | 11 +++
 components/auth/register/viewModel.ts         | 17 +++-
 graphql.schema.json                           | 84 +++++++++++++++++
 i18n/translations.en.json                     |  2 +
 i18n/translations.la.json                     |  2 +
 i18n/translations.th.json                     |  2 +
 lib/generated/graphql.tsx                     | 92 +++++++++++++++++++
 lib/services/profile/me.ts                    |  1 +
 lib/services/profile/profile.graphql          |  3 +
 lib/services/profile/profileService.ts        |  8 +-
 lib/services/register/register.graphql        |  3 +
 lib/services/register/registerService.ts      |  8 +-
 lib/services/user/user.graphql                |  6 ++
 lib/services/user/user.ts                     |  1 +
 lib/services/user/userService.ts              |  7 ++
 24 files changed, 336 insertions(+), 7 deletions(-)

diff --git a/components/admin/profile/updateInfo.tsx b/components/admin/profile/updateInfo.tsx
index d33af687..fe604d45 100644
--- a/components/admin/profile/updateInfo.tsx
+++ b/components/admin/profile/updateInfo.tsx
@@ -109,6 +109,20 @@ const ProfileInfoUpdate = () => {
               />
               <ErrorText>{errors.telephone}</ErrorText>
             </Field>
+            <Field $size="half">
+              <Label htmlFor="address">
+                {t("form.label.address", "Address")}
+              </Label>
+              <TextInput
+                id="address"
+                type="text"
+                placeholder={t("form.placeholder.address", "Address")}
+                onChange={evt => (viewModel.address = evt.target.value)}
+                disabled={viewModel.isSubmitting}
+                value={viewModel.address}
+              />
+              <ErrorText>{errors.address}</ErrorText>
+            </Field>
           </FieldGroup>
           {viewModel.submitError.length > 0 && (
             <FormMessage>{viewModel.submitError}</FormMessage>
diff --git a/components/admin/profile/updateInfoViewModel.ts b/components/admin/profile/updateInfoViewModel.ts
index 5e648667..f87a22f0 100644
--- a/components/admin/profile/updateInfoViewModel.ts
+++ b/components/admin/profile/updateInfoViewModel.ts
@@ -8,6 +8,7 @@ export class ProfileUpdateInfoViewModel extends BaseFormViewModel {
   _firstName: string = "";
   _lastName: string = "";
   _telephone: string = "";
+  _address: string = "";
 
   constructor(readonly me: Me, readonly profileService: IProfileService) {
     super();
@@ -18,6 +19,8 @@ export class ProfileUpdateInfoViewModel extends BaseFormViewModel {
       lastName: computed,
       _telephone: observable,
       telephone: computed,
+      _address: observable,
+      address: computed,
       save: action,
       validate: action,
     });
@@ -30,6 +33,7 @@ export class ProfileUpdateInfoViewModel extends BaseFormViewModel {
     this.firstName = this.me.firstName;
     this.lastName = this.me.lastName;
     this.telephone = this.me.telephone || "";
+    this.address = this.me.address || "";
   }
 
   public get firstName(): string {
@@ -65,6 +69,17 @@ export class ProfileUpdateInfoViewModel extends BaseFormViewModel {
     }
   }
 
+  public get address(): string {
+    return this._address;
+  }
+  public set address(value: string) {
+    this._address = value;
+    delete this.fieldErrors["address"];
+    if (this.submitError.length > 0) {
+      this.submitError = "";
+    }
+  }
+
   public async save(): Promise<boolean> {
     this.isSubmitting = true;
 
@@ -91,7 +106,8 @@ export class ProfileUpdateInfoViewModel extends BaseFormViewModel {
     return this.profileService.updateProfile(
       this.firstName,
       this.lastName,
-      this.telephone
+      this.telephone,
+      this.address
     );
   }
 
diff --git a/components/admin/user/create.tsx b/components/admin/user/create.tsx
index a4288445..8f0d20f7 100644
--- a/components/admin/user/create.tsx
+++ b/components/admin/user/create.tsx
@@ -123,6 +123,17 @@ const UserCreate = () => {
           />
           <ErrorText>{errors.telephone}</ErrorText>
         </Field>
+        <Field $size="half">
+          <Label htmlFor="address">{t("form.label.address", "Address")}</Label>
+          <TextInput
+            id="address"
+            type="text"
+            placeholder={t("form.placeholder.address", "Address")}
+            onChange={evt => (viewModel.address = evt.target.value)}
+            disabled={isSubmitting}
+          />
+          <ErrorText>{errors.address}</ErrorText>
+        </Field>
         <Field $size="half">
           <Label htmlFor="role">{t("form.label.role", "Role")}</Label>
           <Select
diff --git a/components/admin/user/createViewModel.ts b/components/admin/user/createViewModel.ts
index 885804a9..94d2bf7c 100644
--- a/components/admin/user/createViewModel.ts
+++ b/components/admin/user/createViewModel.ts
@@ -12,6 +12,7 @@ export class UserCreateViewModel extends UserViewModel {
       this.lastName,
       this.email,
       this.telephone,
+      this.address,
       this.role
     );
   }
diff --git a/components/admin/user/update.tsx b/components/admin/user/update.tsx
index 6de1dc10..e4568ae4 100644
--- a/components/admin/user/update.tsx
+++ b/components/admin/user/update.tsx
@@ -172,6 +172,30 @@ const UserUpdate = () => {
     [t, viewModel]
   );
 
+  const addressField = useMemo(
+    () => (
+      <Observer>
+        {() => (
+          <Field $size="half">
+            <Label htmlFor="address">
+              {t("form.label.address", "Address")}
+            </Label>
+            <TextInput
+              id="address"
+              type="text"
+              placeholder={t("form.placeholder.address", "Address")}
+              onChange={evt => (viewModel.address = evt.target.value)}
+              disabled={viewModel.isSubmitting}
+              value={viewModel.address}
+            />
+            <ErrorText>{viewModel.fieldErrors.address}</ErrorText>
+          </Field>
+        )}
+      </Observer>
+    ),
+    [t, viewModel]
+  );
+
   const roleField = useMemo(
     () => (
       <Observer>
@@ -224,6 +248,7 @@ const UserUpdate = () => {
           {lastNameField}
           {emailField}
           {telephoneField}
+          {addressField}
           {roleField}
         </FieldGroup>
         {viewModel.submitError.length > 0 && (
diff --git a/components/admin/user/updateViewModel.ts b/components/admin/user/updateViewModel.ts
index 81e2f7c7..40fa221a 100644
--- a/components/admin/user/updateViewModel.ts
+++ b/components/admin/user/updateViewModel.ts
@@ -20,6 +20,7 @@ export class UserUpdateViewModel extends UserViewModel {
       this.lastName = data.lastName;
       this.email = data.email;
       this.telephone = data.telephone || "";
+      this.address = data.address || "";
       this.role = data.role || "";
       this.authorityId = data.authorityId || 0;
     }
@@ -35,6 +36,7 @@ export class UserUpdateViewModel extends UserViewModel {
       this.lastName,
       this.email,
       this.telephone,
+      this.address,
       this.role
     );
   }
diff --git a/components/admin/user/userViewModel.ts b/components/admin/user/userViewModel.ts
index dece973c..26d0b377 100644
--- a/components/admin/user/userViewModel.ts
+++ b/components/admin/user/userViewModel.ts
@@ -14,6 +14,7 @@ export abstract class UserViewModel extends BaseFormViewModel {
   _lastName: string = "";
   _email: string = "";
   _telephone: string = "";
+  _address: string = "";
   _role: string = AccountsAuthorityUserRoleChoices.Rep;
   constructor(userService: IUserService) {
     super();
@@ -30,6 +31,8 @@ export abstract class UserViewModel extends BaseFormViewModel {
       email: computed,
       _telephone: observable,
       telephone: computed,
+      _address: observable,
+      address: computed,
       _role: observable,
       role: computed,
       save: action,
@@ -104,6 +107,17 @@ export abstract class UserViewModel extends BaseFormViewModel {
     }
   }
 
+  public get address(): string {
+    return this._address;
+  }
+  public set address(value: string) {
+    this._address = value;
+    delete this.fieldErrors["address"];
+    if (this.submitError.length > 0) {
+      this.submitError = "";
+    }
+  }
+
   public get role(): string {
     return this._role;
   }
diff --git a/components/admin/user/view.tsx b/components/admin/user/view.tsx
index 33ca6237..2ab1ffdd 100644
--- a/components/admin/user/view.tsx
+++ b/components/admin/user/view.tsx
@@ -82,6 +82,15 @@ const UserView = () => {
                 </th>
                 <td className="px-6 py-4">{viewModel.data.telephone}</td>
               </tr>
+              <tr className="border-b dark:bg-gray-800 dark:border-gray-700 odd:bg-white even:bg-gray-50 odd:dark:bg-gray-800 even:dark:bg-gray-700">
+                <th
+                  scope="row"
+                  className="px-6 py-4 font-medium text-gray-900 dark:text-white whitespace-nowrap"
+                >
+                  {t("form.label.address", "Address")}
+                </th>
+                <td className="px-6 py-4">{viewModel.data.address}</td>
+              </tr>
               <tr>
                 <th
                   scope="row"
diff --git a/components/auth/register/index.tsx b/components/auth/register/index.tsx
index 6783858f..691201d6 100644
--- a/components/auth/register/index.tsx
+++ b/components/auth/register/index.tsx
@@ -48,7 +48,7 @@ const Register = () => {
               alt="img"
             />
           </div>
-          <div className="flex items-center justify-center p-6 sm:p-12 md:w-1/2">
+          <div className="h-screen flex items-center justify-center p-6 sm:p-12 md:w-1/2 overflow-y-auto">
             <div className="w-full">
               <h1 className="mb-4 text-2xl font-bold text-center text-gray-700">
                 {t("title.signup", "Sing Up")}
diff --git a/components/auth/register/registerUser.tsx b/components/auth/register/registerUser.tsx
index f0868b52..96ef499b 100644
--- a/components/auth/register/registerUser.tsx
+++ b/components/auth/register/registerUser.tsx
@@ -103,6 +103,17 @@ const RegisterUser: React.FC<RegisterUserProps> = ({ viewModel }) => {
         />
         <ErrorText>{errors.telephone}</ErrorText>
       </Field>
+      <Field $size="full">
+        <Label htmlFor="address">{t("form.label.address", "Address")}</Label>
+        <TextInput
+          id="address"
+          type="text"
+          placeholder={t("form.placeholder.address", "Address")}
+          onChange={evt => (viewModel.address = evt.target.value)}
+          disabled={isSubmitting}
+        />
+        <ErrorText>{errors.address}</ErrorText>
+      </Field>
       {viewModel.submitError.length > 0 && (
         <FormMessage>{viewModel.submitError}</FormMessage>
       )}
diff --git a/components/auth/register/viewModel.ts b/components/auth/register/viewModel.ts
index d09badf9..acb4e900 100644
--- a/components/auth/register/viewModel.ts
+++ b/components/auth/register/viewModel.ts
@@ -23,6 +23,7 @@ export class RegisterViewModel {
   _lastName: string = "";
   _email: string = "";
   _telephone: string = "";
+  _address: string = "";
   _authorityName: string = "";
 
   fieldErrors: { [key: string]: string } = {};
@@ -57,6 +58,8 @@ export class RegisterViewModel {
       email: computed,
       _telephone: observable,
       telephone: computed,
+      _address: observable,
+      address: computed,
       fieldErrors: observable,
       submitError: observable,
       checkInvitationCode: action,
@@ -162,6 +165,17 @@ export class RegisterViewModel {
     }
   }
 
+  public get address(): string {
+    return this._address;
+  }
+  public set address(value: string) {
+    this._address = value;
+    delete this.fieldErrors["address"];
+    if (this.submitError.length > 0) {
+      this.submitError = "";
+    }
+  }
+
   public get isValid(): boolean {
     return Object.keys(this.fieldErrors).length === 0;
   }
@@ -199,7 +213,8 @@ export class RegisterViewModel {
         this.firstName,
         this.lastName,
         this.email,
-        this.telephone
+        this.telephone,
+        this.address
       );
       this.isSubmitting = false;
       if (result.success) {
diff --git a/graphql.schema.json b/graphql.schema.json
index eaceade6..f78dab65 100644
--- a/graphql.schema.json
+++ b/graphql.schema.json
@@ -1193,6 +1193,18 @@
         "name": "AdminAuthorityUserCreateSuccess",
         "description": null,
         "fields": [
+          {
+            "name": "address",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "authority",
             "description": null,
@@ -11367,6 +11379,18 @@
         "name": "AuthorityUserType",
         "description": null,
         "fields": [
+          {
+            "name": "address",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "authority",
             "description": null,
@@ -14894,6 +14918,18 @@
             "name": "adminAuthorityUserCreate",
             "description": null,
             "args": [
+              {
+                "name": "address",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": "null",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
               {
                 "name": "authorityId",
                 "description": null,
@@ -15052,6 +15088,18 @@
             "name": "adminAuthorityUserUpdate",
             "description": null,
             "args": [
+              {
+                "name": "address",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": "null",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
               {
                 "name": "authorityId",
                 "description": null,
@@ -18778,6 +18826,18 @@
             "name": "adminUserUpdateProfile",
             "description": null,
             "args": [
+              {
+                "name": "address",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": "null",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
               {
                 "name": "firstName",
                 "description": null,
@@ -18860,6 +18920,18 @@
             "name": "authorityUserRegister",
             "description": null,
             "args": [
+              {
+                "name": "address",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": "null",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
               {
                 "name": "email",
                 "description": null,
@@ -30113,6 +30185,18 @@
         "name": "UserProfileType",
         "description": null,
         "fields": [
+          {
+            "name": "address",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "authorityId",
             "description": null,
diff --git a/i18n/translations.en.json b/i18n/translations.en.json
index 96177975..c1fd372b 100644
--- a/i18n/translations.en.json
+++ b/i18n/translations.en.json
@@ -63,6 +63,7 @@
       "lastName": "Last Name",
       "email": "Email",
       "telephone": "Telephone",
+      "address": "Address",
       "inherits": "Inherits",
       "area": "Area",
       "category": "Category",
@@ -153,6 +154,7 @@
       "lastName": "Last Name",
       "email": "Email",
       "telephone": "Telephone",
+      "address": "Address",
       "inherits": "Inherits",
       "area": "Area",
       "category": "Category",
diff --git a/i18n/translations.la.json b/i18n/translations.la.json
index 90d412d5..1d0fb2f5 100644
--- a/i18n/translations.la.json
+++ b/i18n/translations.la.json
@@ -64,6 +64,7 @@
       "lastName": "ນາມ​ສະ​ກຸນ",
       "email": "ອີເມວ",
       "telephone": "ເບີ​ໂທລະ​ສັບ",
+      "address": "ທີ່ຢູ່",
       "inherits": "ສືບທອດ",
       "area": "ພື້ນທີ່",
       "category": "ກຸ່ມ",
@@ -154,6 +155,7 @@
       "lastName": "ນາມ​ສະ​ກຸນ",
       "email": "ອີເມວ",
       "telephone": "ເບີ​ໂທລະ​ສັບ",
+      "address": "ທີ່ຢູ່",
       "inherits": "ສືບທອດ",
       "area": "ພື້ນທີ່",
       "category": "ກຸ່ມ",
diff --git a/i18n/translations.th.json b/i18n/translations.th.json
index ce6b6fb5..7ea65421 100644
--- a/i18n/translations.th.json
+++ b/i18n/translations.th.json
@@ -61,6 +61,7 @@
       "lastName": "นามสกุล",
       "email": "อีเมล",
       "telephone": "โทรศัพท์",
+      "address": "ที่อยู่",
       "inherits": "สืบทอด",
       "area": "พื้นที่",
       "category": "หมวดหมู่",
@@ -150,6 +151,7 @@
       "lastName": "นามสกุล",
       "email": "อีเมล",
       "telephone": "โทรศัพท์",
+      "address": "ที่อยู่",
       "inherits": "สืบทอด",
       "area": "พื้นที่",
       "category": "หมวดหมู่",
diff --git a/lib/generated/graphql.tsx b/lib/generated/graphql.tsx
index e98a7d87..d4cc0357 100644
--- a/lib/generated/graphql.tsx
+++ b/lib/generated/graphql.tsx
@@ -207,6 +207,7 @@ export type AdminAuthorityUserCreateResult =
 
 export type AdminAuthorityUserCreateSuccess = {
   __typename?: "AdminAuthorityUserCreateSuccess";
+  address?: Maybe<Scalars["String"]>;
   authority: AdminAuthorityCreateSuccess;
   avatar?: Maybe<Scalars["String"]>;
   avatarUrl?: Maybe<Scalars["String"]>;
@@ -1496,6 +1497,7 @@ export type AuthorityUserRegisterMutation = {
 
 export type AuthorityUserType = {
   __typename?: "AuthorityUserType";
+  address?: Maybe<Scalars["String"]>;
   authority: AdminAuthorityCreateSuccess;
   email: Scalars["String"];
   firstName: Scalars["String"];
@@ -1972,6 +1974,7 @@ export type MutationAdminAuthorityUpdateArgs = {
 };
 
 export type MutationAdminAuthorityUserCreateArgs = {
+  address?: InputMaybe<Scalars["String"]>;
   authorityId?: InputMaybe<Scalars["Int"]>;
   email: Scalars["String"];
   firstName: Scalars["String"];
@@ -1987,6 +1990,7 @@ export type MutationAdminAuthorityUserDeleteArgs = {
 };
 
 export type MutationAdminAuthorityUserUpdateArgs = {
+  address?: InputMaybe<Scalars["String"]>;
   authorityId?: InputMaybe<Scalars["Int"]>;
   email: Scalars["String"];
   firstName: Scalars["String"];
@@ -2345,6 +2349,7 @@ export type MutationAdminUserChangePasswordArgs = {
 };
 
 export type MutationAdminUserUpdateProfileArgs = {
+  address?: InputMaybe<Scalars["String"]>;
   firstName: Scalars["String"];
   lastName: Scalars["String"];
   telephone?: InputMaybe<Scalars["String"]>;
@@ -2355,6 +2360,7 @@ export type MutationAdminUserUploadAvatarArgs = {
 };
 
 export type MutationAuthorityUserRegisterArgs = {
+  address?: InputMaybe<Scalars["String"]>;
   email: Scalars["String"];
   firstName: Scalars["String"];
   invitationCode: Scalars["String"];
@@ -3632,6 +3638,7 @@ export type UserMessageTypeNodeConnection = {
 
 export type UserProfileType = {
   __typename?: "UserProfileType";
+  address?: Maybe<Scalars["String"]>;
   authorityId?: Maybe<Scalars["Int"]>;
   authorityName?: Maybe<Scalars["String"]>;
   avatarUrl?: Maybe<Scalars["String"]>;
@@ -5722,6 +5729,7 @@ export type MeQuery = {
     role?: string | null;
     email?: string | null;
     telephone?: string | null;
+    address?: string | null;
     features?: Array<string | null> | null;
   } | null;
 };
@@ -5742,6 +5750,7 @@ export type UserUpdateProfileMutationVariables = Exact<{
   firstName: Scalars["String"];
   lastName: Scalars["String"];
   telephone?: InputMaybe<Scalars["String"]>;
+  address?: InputMaybe<Scalars["String"]>;
 }>;
 
 export type UserUpdateProfileMutation = {
@@ -5801,6 +5810,7 @@ export type UserRegisterMutationVariables = Exact<{
   invitationCode: Scalars["String"];
   lastName: Scalars["String"];
   telephone?: InputMaybe<Scalars["String"]>;
+  address?: InputMaybe<Scalars["String"]>;
   username: Scalars["String"];
 }>;
 
@@ -5824,6 +5834,7 @@ export type UserRegisterMutation = {
       isSuperuser?: boolean | null;
       email?: string | null;
       telephone?: string | null;
+      address?: string | null;
       features?: Array<string | null> | null;
     } | null;
   } | null;
@@ -7031,6 +7042,7 @@ export type UserCreateMutationVariables = Exact<{
   password: Scalars["String"];
   telephone?: InputMaybe<Scalars["String"]>;
   username: Scalars["String"];
+  address?: InputMaybe<Scalars["String"]>;
   role?: InputMaybe<Scalars["String"]>;
 }>;
 
@@ -7065,6 +7077,7 @@ export type UserUpdateMutationVariables = Exact<{
   lastName: Scalars["String"];
   telephone?: InputMaybe<Scalars["String"]>;
   username: Scalars["String"];
+  address?: InputMaybe<Scalars["String"]>;
   role?: InputMaybe<Scalars["String"]>;
 }>;
 
@@ -7093,6 +7106,7 @@ export type UserUpdateMutation = {
             email: string;
             telephone?: string | null;
             role?: AccountsAuthorityUserRoleChoices | null;
+            address?: string | null;
             authority: {
               __typename?: "AdminAuthorityCreateSuccess";
               id: string;
@@ -7160,6 +7174,7 @@ export type GetUserQuery = {
     lastName: string;
     email: string;
     telephone?: string | null;
+    address?: string | null;
     role?: AccountsAuthorityUserRoleChoices | null;
     authority: { __typename?: "AdminAuthorityCreateSuccess"; id: string };
   } | null;
@@ -17247,6 +17262,7 @@ export const MeDocument = {
                 { kind: "Field", name: { kind: "Name", value: "role" } },
                 { kind: "Field", name: { kind: "Name", value: "email" } },
                 { kind: "Field", name: { kind: "Name", value: "telephone" } },
+                { kind: "Field", name: { kind: "Name", value: "address" } },
                 { kind: "Field", name: { kind: "Name", value: "features" } },
               ],
             },
@@ -17354,6 +17370,14 @@ export const UserUpdateProfileDocument = {
           },
           type: { kind: "NamedType", name: { kind: "Name", value: "String" } },
         },
+        {
+          kind: "VariableDefinition",
+          variable: {
+            kind: "Variable",
+            name: { kind: "Name", value: "address" },
+          },
+          type: { kind: "NamedType", name: { kind: "Name", value: "String" } },
+        },
       ],
       selectionSet: {
         kind: "SelectionSet",
@@ -17386,6 +17410,14 @@ export const UserUpdateProfileDocument = {
                   name: { kind: "Name", value: "telephone" },
                 },
               },
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "address" },
+                value: {
+                  kind: "Variable",
+                  name: { kind: "Name", value: "address" },
+                },
+              },
             ],
             selectionSet: {
               kind: "SelectionSet",
@@ -17618,6 +17650,15 @@ export const UserRegisterDocument = {
           type: { kind: "NamedType", name: { kind: "Name", value: "String" } },
           defaultValue: { kind: "NullValue" },
         },
+        {
+          kind: "VariableDefinition",
+          variable: {
+            kind: "Variable",
+            name: { kind: "Name", value: "address" },
+          },
+          type: { kind: "NamedType", name: { kind: "Name", value: "String" } },
+          defaultValue: { kind: "NullValue" },
+        },
         {
           kind: "VariableDefinition",
           variable: {
@@ -17680,6 +17721,14 @@ export const UserRegisterDocument = {
                   name: { kind: "Name", value: "telephone" },
                 },
               },
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "address" },
+                value: {
+                  kind: "Variable",
+                  name: { kind: "Name", value: "address" },
+                },
+              },
               {
                 kind: "Argument",
                 name: { kind: "Name", value: "username" },
@@ -17737,6 +17786,10 @@ export const UserRegisterDocument = {
                         kind: "Field",
                         name: { kind: "Name", value: "telephone" },
                       },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "address" },
+                      },
                       {
                         kind: "Field",
                         name: { kind: "Name", value: "features" },
@@ -23771,6 +23824,15 @@ export const UserCreateDocument = {
             },
           },
         },
+        {
+          kind: "VariableDefinition",
+          variable: {
+            kind: "Variable",
+            name: { kind: "Name", value: "address" },
+          },
+          type: { kind: "NamedType", name: { kind: "Name", value: "String" } },
+          defaultValue: { kind: "NullValue" },
+        },
         {
           kind: "VariableDefinition",
           variable: { kind: "Variable", name: { kind: "Name", value: "role" } },
@@ -23840,6 +23902,14 @@ export const UserCreateDocument = {
                   name: { kind: "Name", value: "username" },
                 },
               },
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "address" },
+                value: {
+                  kind: "Variable",
+                  name: { kind: "Name", value: "address" },
+                },
+              },
               {
                 kind: "Argument",
                 name: { kind: "Name", value: "role" },
@@ -24024,6 +24094,15 @@ export const UserUpdateDocument = {
             },
           },
         },
+        {
+          kind: "VariableDefinition",
+          variable: {
+            kind: "Variable",
+            name: { kind: "Name", value: "address" },
+          },
+          type: { kind: "NamedType", name: { kind: "Name", value: "String" } },
+          defaultValue: { kind: "NullValue" },
+        },
         {
           kind: "VariableDefinition",
           variable: { kind: "Variable", name: { kind: "Name", value: "role" } },
@@ -24093,6 +24172,14 @@ export const UserUpdateDocument = {
                   name: { kind: "Name", value: "username" },
                 },
               },
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "address" },
+                value: {
+                  kind: "Variable",
+                  name: { kind: "Name", value: "address" },
+                },
+              },
               {
                 kind: "Argument",
                 name: { kind: "Name", value: "role" },
@@ -24161,6 +24248,10 @@ export const UserUpdateDocument = {
                                     kind: "Field",
                                     name: { kind: "Name", value: "role" },
                                   },
+                                  {
+                                    kind: "Field",
+                                    name: { kind: "Name", value: "address" },
+                                  },
                                   {
                                     kind: "Field",
                                     name: { kind: "Name", value: "authority" },
@@ -24464,6 +24555,7 @@ export const GetUserDocument = {
                 { kind: "Field", name: { kind: "Name", value: "lastName" } },
                 { kind: "Field", name: { kind: "Name", value: "email" } },
                 { kind: "Field", name: { kind: "Name", value: "telephone" } },
+                { kind: "Field", name: { kind: "Name", value: "address" } },
                 { kind: "Field", name: { kind: "Name", value: "role" } },
                 {
                   kind: "Field",
diff --git a/lib/services/profile/me.ts b/lib/services/profile/me.ts
index f00af812..78cf5a58 100644
--- a/lib/services/profile/me.ts
+++ b/lib/services/profile/me.ts
@@ -12,6 +12,7 @@ export type Me = {
   isSuperUser: boolean;
   email: string;
   telephone: string;
+  address: string;
   features: Array<string>;
 };
 
diff --git a/lib/services/profile/profile.graphql b/lib/services/profile/profile.graphql
index c3fa256d..31073bef 100644
--- a/lib/services/profile/profile.graphql
+++ b/lib/services/profile/profile.graphql
@@ -12,6 +12,7 @@ query me {
     role
     email
     telephone
+    address
     features
   }
 }
@@ -26,11 +27,13 @@ mutation userUpdateProfile(
   $firstName: String!
   $lastName: String!
   $telephone: String
+  $address: String
 ) {
   adminUserUpdateProfile(
     firstName: $firstName
     lastName: $lastName
     telephone: $telephone
+    address: $address
   ) {
     success
   }
diff --git a/lib/services/profile/profileService.ts b/lib/services/profile/profileService.ts
index ca047787..73b8432d 100644
--- a/lib/services/profile/profileService.ts
+++ b/lib/services/profile/profileService.ts
@@ -19,7 +19,8 @@ export interface IProfileService extends IService {
   updateProfile(
     firstName: string,
     lastName: string,
-    telephone?: string
+    telephone?: string,
+    address?: string
   ): Promise<SaveResult<ProfileUpdate>>;
 
   deleteMyAccount(): Promise<SaveResult<void>>;
@@ -54,6 +55,7 @@ export class ProfileService implements IProfileService {
         isSuperUser: me.isSuperuser || false,
         email: me.email || "",
         telephone: me.telephone || "",
+        address: me.address || "",
         features: me.features as Array<string>,
       };
     } else {
@@ -115,7 +117,8 @@ export class ProfileService implements IProfileService {
   async updateProfile(
     firstName: string,
     lastName: string,
-    telephone?: string
+    telephone?: string,
+    address?: string
   ): Promise<SaveResult<ProfileUpdate>> {
     const updateResult = await this.client.mutate({
       mutation: UserUpdateProfileDocument,
@@ -123,6 +126,7 @@ export class ProfileService implements IProfileService {
         firstName,
         lastName,
         telephone,
+        address,
       },
     });
 
diff --git a/lib/services/register/register.graphql b/lib/services/register/register.graphql
index 467f951d..b31b4228 100644
--- a/lib/services/register/register.graphql
+++ b/lib/services/register/register.graphql
@@ -15,6 +15,7 @@ mutation UserRegister(
   $invitationCode: String!
   $lastName: String!
   $telephone: String = null
+  $address: String = null
   $username: String!
 ) {
   authorityUserRegister(
@@ -23,6 +24,7 @@ mutation UserRegister(
     invitationCode: $invitationCode
     lastName: $lastName
     telephone: $telephone
+    address: $address
     username: $username
   ) {
     me {
@@ -38,6 +40,7 @@ mutation UserRegister(
       isSuperuser
       email
       telephone
+      address
       features
     }
     refreshToken
diff --git a/lib/services/register/registerService.ts b/lib/services/register/registerService.ts
index 46ffd678..8497c543 100644
--- a/lib/services/register/registerService.ts
+++ b/lib/services/register/registerService.ts
@@ -14,7 +14,8 @@ export interface IRegisterService extends IService {
     firstName?: string,
     lastName?: string,
     email?: string,
-    phone?: string
+    phone?: string,
+    address?: string
   ): Promise<RegisterResult>;
 }
 
@@ -56,7 +57,8 @@ export class RegisterService implements IRegisterService {
     firstName: string,
     lastName: string,
     email: string,
-    telephone?: string
+    telephone?: string,
+    address?: string
   ): Promise<RegisterResult> {
     const registerResult = await this.client.mutate({
       mutation: UserRegisterDocument,
@@ -67,6 +69,7 @@ export class RegisterService implements IRegisterService {
         lastName: lastName,
         email: email,
         telephone: telephone,
+        address: address,
       },
       fetchPolicy: "network-only",
     });
@@ -96,6 +99,7 @@ export class RegisterService implements IRegisterService {
         isSuperUser: me.isSuperuser || false,
         email: me.email || "",
         telephone: me.telephone || "",
+        address: me.address || "",
         features: me.features as Array<string>,
       },
       tokenAuth: {
diff --git a/lib/services/user/user.graphql b/lib/services/user/user.graphql
index 47084cc0..150d22e1 100644
--- a/lib/services/user/user.graphql
+++ b/lib/services/user/user.graphql
@@ -43,6 +43,7 @@ mutation UserCreate(
   $password: String!
   $telephone: String = null
   $username: String!
+  $address: String = null
   $role: String
 ) {
   adminAuthorityUserCreate(
@@ -53,6 +54,7 @@ mutation UserCreate(
     password: $password
     telephone: $telephone
     username: $username
+    address: $address
     role: $role
   ) {
     result {
@@ -80,6 +82,7 @@ mutation UserUpdate(
   $lastName: String!
   $telephone: String = null
   $username: String!
+  $address: String = null
   $role: String
 ) {
   adminAuthorityUserUpdate(
@@ -90,6 +93,7 @@ mutation UserUpdate(
     lastName: $lastName
     telephone: $telephone
     username: $username
+    address: $address
     role: $role
   ) {
     result {
@@ -103,6 +107,7 @@ mutation UserUpdate(
           email
           telephone
           role
+          address
           authority {
             id
           }
@@ -154,6 +159,7 @@ query GetUser($id: ID!) {
     lastName
     email
     telephone
+    address
     role
     authority {
       id
diff --git a/lib/services/user/user.ts b/lib/services/user/user.ts
index 694fabb3..d6e21261 100644
--- a/lib/services/user/user.ts
+++ b/lib/services/user/user.ts
@@ -5,6 +5,7 @@ export type User = {
   lastName: string;
   email: string;
   telephone?: string;
+  address?: string;
   avatarUrl?: string;
   role?: string | null;
   authorityId?: number;
diff --git a/lib/services/user/userService.ts b/lib/services/user/userService.ts
index 50e13b28..9a22604e 100644
--- a/lib/services/user/userService.ts
+++ b/lib/services/user/userService.ts
@@ -43,6 +43,7 @@ export interface IUserService extends IService {
     lastName: string,
     email: string,
     telephone: string,
+    address: string,
     role: string
   ): Promise<SaveResult<User>>;
 
@@ -54,6 +55,7 @@ export interface IUserService extends IService {
     lastName: string,
     email: string,
     telephone: string,
+    address: string,
     role: string
   ): Promise<SaveResult<User>>;
 
@@ -150,6 +152,7 @@ export class UserService implements IUserService {
         lastName: user.lastName,
         email: user.email,
         telephone: user.telephone || "",
+        address: user.address || "",
         role: user.role,
         authorityId: parseInt(user.authority.id),
       };
@@ -167,6 +170,7 @@ export class UserService implements IUserService {
     lastName: string,
     email: string,
     telephone: string,
+    address: string,
     role: string
   ): Promise<SaveResult<User>> {
     const createResult = await this.client.mutate({
@@ -179,6 +183,7 @@ export class UserService implements IUserService {
         lastName,
         email,
         telephone,
+        address,
         role,
       },
       refetchQueries: [
@@ -231,6 +236,7 @@ export class UserService implements IUserService {
     lastName: string,
     email: string,
     telephone: string,
+    address: string,
     role: string
   ): Promise<SaveResult<User>> {
     const updateResult = await this.client.mutate({
@@ -243,6 +249,7 @@ export class UserService implements IUserService {
         lastName,
         email,
         telephone,
+        address,
         role,
       },
       refetchQueries: [