diff --git a/admin-ui/src/api/user/User.ts b/admin-ui/src/api/user/User.ts
index 4e86caf..3a5f872 100644
--- a/admin-ui/src/api/user/User.ts
+++ b/admin-ui/src/api/user/User.ts
@@ -8,4 +8,5 @@ export type User = {
lastName: string | null;
username: string;
roles: JsonValue;
+ age: string | null;
};
diff --git a/admin-ui/src/api/user/UserCreateInput.ts b/admin-ui/src/api/user/UserCreateInput.ts
index cd7fa5a..f3aa45e 100644
--- a/admin-ui/src/api/user/UserCreateInput.ts
+++ b/admin-ui/src/api/user/UserCreateInput.ts
@@ -6,4 +6,5 @@ export type UserCreateInput = {
username: string;
password: string;
roles: InputJsonValue;
+ age?: string | null;
};
diff --git a/admin-ui/src/api/user/UserOrderByInput.ts b/admin-ui/src/api/user/UserOrderByInput.ts
index cde82ed..95ecf00 100644
--- a/admin-ui/src/api/user/UserOrderByInput.ts
+++ b/admin-ui/src/api/user/UserOrderByInput.ts
@@ -9,4 +9,5 @@ export type UserOrderByInput = {
username?: SortOrder;
password?: SortOrder;
roles?: SortOrder;
+ age?: SortOrder;
};
diff --git a/admin-ui/src/api/user/UserUpdateInput.ts b/admin-ui/src/api/user/UserUpdateInput.ts
index e4fc533..0a8d424 100644
--- a/admin-ui/src/api/user/UserUpdateInput.ts
+++ b/admin-ui/src/api/user/UserUpdateInput.ts
@@ -6,4 +6,5 @@ export type UserUpdateInput = {
username?: string;
password?: string;
roles?: InputJsonValue;
+ age?: string | null;
};
diff --git a/admin-ui/src/api/user/UserWhereInput.ts b/admin-ui/src/api/user/UserWhereInput.ts
index fcd81c7..0f29b04 100644
--- a/admin-ui/src/api/user/UserWhereInput.ts
+++ b/admin-ui/src/api/user/UserWhereInput.ts
@@ -6,4 +6,5 @@ export type UserWhereInput = {
firstName?: StringNullableFilter;
lastName?: StringNullableFilter;
username?: StringFilter;
+ age?: StringNullableFilter;
};
diff --git a/admin-ui/src/user/UserCreate.tsx b/admin-ui/src/user/UserCreate.tsx
index dfda515..52e3bea 100644
--- a/admin-ui/src/user/UserCreate.tsx
+++ b/admin-ui/src/user/UserCreate.tsx
@@ -25,6 +25,7 @@ export const UserCreate = (props: CreateProps): React.ReactElement => {
optionText="label"
optionValue="value"
/>
+
);
diff --git a/admin-ui/src/user/UserEdit.tsx b/admin-ui/src/user/UserEdit.tsx
index 57aa95e..b158548 100644
--- a/admin-ui/src/user/UserEdit.tsx
+++ b/admin-ui/src/user/UserEdit.tsx
@@ -23,6 +23,7 @@ export const UserEdit = (props: EditProps): React.ReactElement => {
optionText="label"
optionValue="value"
/>
+
);
diff --git a/admin-ui/src/user/UserList.tsx b/admin-ui/src/user/UserList.tsx
index 87afc5e..0db51f1 100644
--- a/admin-ui/src/user/UserList.tsx
+++ b/admin-ui/src/user/UserList.tsx
@@ -19,6 +19,7 @@ export const UserList = (props: ListProps): React.ReactElement => {
+
);
diff --git a/admin-ui/src/user/UserShow.tsx b/admin-ui/src/user/UserShow.tsx
index 5e9d39d..9955f0c 100644
--- a/admin-ui/src/user/UserShow.tsx
+++ b/admin-ui/src/user/UserShow.tsx
@@ -18,6 +18,7 @@ export const UserShow = (props: ShowProps): React.ReactElement => {
+
);
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 81ef875..ffacf2d 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -16,4 +16,5 @@ model User {
username String @unique
password String
roles Json
+ age String?
}
diff --git a/server/src/swagger.ts b/server/src/swagger.ts
index eb21a8e..c90625f 100644
--- a/server/src/swagger.ts
+++ b/server/src/swagger.ts
@@ -7,7 +7,7 @@ export const swaggerDocumentOptions = new DocumentBuilder()
.setDescription(
'\n\n## Congratulations! Your service resource is ready.\n \nPlease note that all endpoints are secured with JWT Bearer authentication.\nBy default, your service resource comes with one user with the username "admin" and password "admin".\nLearn more in [our docs](https://docs.amplication.com)'
)
- .setVersion("1104a18s")
+ .setVersion("g914j4pz")
.addBearerAuth()
.build();
diff --git a/server/src/user/base/User.ts b/server/src/user/base/User.ts
index e4f12cd..274de14 100644
--- a/server/src/user/base/User.ts
+++ b/server/src/user/base/User.ts
@@ -78,6 +78,17 @@ class User {
@IsJSON()
@Field(() => GraphQLJSON)
roles!: JsonValue;
+
+ @ApiProperty({
+ required: false,
+ type: String,
+ })
+ @IsString()
+ @IsOptional()
+ @Field(() => String, {
+ nullable: true,
+ })
+ age!: string | null;
}
export { User as User };
diff --git a/server/src/user/base/UserCreateInput.ts b/server/src/user/base/UserCreateInput.ts
index 398f9b4..853f9df 100644
--- a/server/src/user/base/UserCreateInput.ts
+++ b/server/src/user/base/UserCreateInput.ts
@@ -61,6 +61,17 @@ class UserCreateInput {
@IsJSON()
@Field(() => GraphQLJSON)
roles!: InputJsonValue;
+
+ @ApiProperty({
+ required: false,
+ type: String,
+ })
+ @IsString()
+ @IsOptional()
+ @Field(() => String, {
+ nullable: true,
+ })
+ age?: string | null;
}
export { UserCreateInput as UserCreateInput };
diff --git a/server/src/user/base/UserOrderByInput.ts b/server/src/user/base/UserOrderByInput.ts
index a76564c..c7dacbb 100644
--- a/server/src/user/base/UserOrderByInput.ts
+++ b/server/src/user/base/UserOrderByInput.ts
@@ -89,6 +89,15 @@ class UserOrderByInput {
nullable: true,
})
roles?: SortOrder;
+
+ @ApiProperty({
+ required: false,
+ enum: ["asc", "desc"],
+ })
+ @Field(() => SortOrder, {
+ nullable: true,
+ })
+ age?: SortOrder;
}
export { UserOrderByInput as UserOrderByInput };
diff --git a/server/src/user/base/UserUpdateInput.ts b/server/src/user/base/UserUpdateInput.ts
index c0bd636..985f98c 100644
--- a/server/src/user/base/UserUpdateInput.ts
+++ b/server/src/user/base/UserUpdateInput.ts
@@ -70,6 +70,17 @@ class UserUpdateInput {
nullable: true,
})
roles?: InputJsonValue;
+
+ @ApiProperty({
+ required: false,
+ type: String,
+ })
+ @IsString()
+ @IsOptional()
+ @Field(() => String, {
+ nullable: true,
+ })
+ age?: string | null;
}
export { UserUpdateInput as UserUpdateInput };
diff --git a/server/src/user/base/UserWhereInput.ts b/server/src/user/base/UserWhereInput.ts
index 00bc16b..168ecc7 100644
--- a/server/src/user/base/UserWhereInput.ts
+++ b/server/src/user/base/UserWhereInput.ts
@@ -61,6 +61,17 @@ class UserWhereInput {
nullable: true,
})
username?: StringFilter;
+
+ @ApiProperty({
+ required: false,
+ type: StringNullableFilter,
+ })
+ @Type(() => StringNullableFilter)
+ @IsOptional()
+ @Field(() => StringNullableFilter, {
+ nullable: true,
+ })
+ age?: StringNullableFilter;
}
export { UserWhereInput as UserWhereInput };
diff --git a/server/src/user/base/user.controller.base.spec.ts b/server/src/user/base/user.controller.base.spec.ts
index f3def16..88e3b07 100644
--- a/server/src/user/base/user.controller.base.spec.ts
+++ b/server/src/user/base/user.controller.base.spec.ts
@@ -26,6 +26,7 @@ const CREATE_INPUT = {
lastName: "exampleLastName",
username: "exampleUsername",
password: "examplePassword",
+ age: "exampleAge",
};
const CREATE_RESULT = {
id: "exampleId",
@@ -35,6 +36,7 @@ const CREATE_RESULT = {
lastName: "exampleLastName",
username: "exampleUsername",
password: "examplePassword",
+ age: "exampleAge",
};
const FIND_MANY_RESULT = [
{
@@ -45,6 +47,7 @@ const FIND_MANY_RESULT = [
lastName: "exampleLastName",
username: "exampleUsername",
password: "examplePassword",
+ age: "exampleAge",
},
];
const FIND_ONE_RESULT = {
@@ -55,6 +58,7 @@ const FIND_ONE_RESULT = {
lastName: "exampleLastName",
username: "exampleUsername",
password: "examplePassword",
+ age: "exampleAge",
};
const service = {
diff --git a/server/src/user/base/user.controller.base.ts b/server/src/user/base/user.controller.base.ts
index 02d3c7f..46785f0 100644
--- a/server/src/user/base/user.controller.base.ts
+++ b/server/src/user/base/user.controller.base.ts
@@ -57,6 +57,7 @@ export class UserControllerBase {
lastName: true,
username: true,
roles: true,
+ age: true,
},
});
}
@@ -85,6 +86,7 @@ export class UserControllerBase {
lastName: true,
username: true,
roles: true,
+ age: true,
},
});
}
@@ -114,6 +116,7 @@ export class UserControllerBase {
lastName: true,
username: true,
roles: true,
+ age: true,
},
});
if (result === null) {
@@ -152,6 +155,7 @@ export class UserControllerBase {
lastName: true,
username: true,
roles: true,
+ age: true,
},
});
} catch (error) {
@@ -189,6 +193,7 @@ export class UserControllerBase {
lastName: true,
username: true,
roles: true,
+ age: true,
},
});
} catch (error) {