发给xvcvx (Amplication build 9wjatxvr)

admin-ui/src/api/user/User.ts

@@ -8,4 +8,5 @@ export type User = {
   lastName: string | null;
   username: string;
   roles: JsonValue;
+  age: string | null;
 };

admin-ui/src/api/user/UserCreateInput.ts

@@ -6,4 +6,5 @@ export type UserCreateInput = {
   username: string;
   password: string;
   roles: InputJsonValue;
+  age?: string | null;
 };

admin-ui/src/api/user/UserOrderByInput.ts

@@ -9,4 +9,5 @@ export type UserOrderByInput = {
   username?: SortOrder;
   password?: SortOrder;
   roles?: SortOrder;
+  age?: SortOrder;
 };

admin-ui/src/api/user/UserUpdateInput.ts

@@ -6,4 +6,5 @@ export type UserUpdateInput = {
   username?: string;
   password?: string;
   roles?: InputJsonValue;
+  age?: string | null;
 };

admin-ui/src/api/user/UserWhereInput.ts

@@ -6,4 +6,5 @@ export type UserWhereInput = {
   firstName?: StringNullableFilter;
   lastName?: StringNullableFilter;
   username?: StringFilter;
+  age?: StringNullableFilter;
 };

admin-ui/src/user/UserCreate.tsx

@@ -25,6 +25,7 @@ export const UserCreate = (props: CreateProps): React.ReactElement => {
           optionText="label"
           optionValue="value"
         />
+        <TextInput label="age" source="age" />
       </SimpleForm>
     </Create>
   );

admin-ui/src/user/UserEdit.tsx

@@ -23,6 +23,7 @@ export const UserEdit = (props: EditProps): React.ReactElement => {
           optionText="label"
           optionValue="value"
         />
+        <TextInput label="age" source="age" />
       </SimpleForm>
     </Edit>
   );

admin-ui/src/user/UserList.tsx

@@ -19,6 +19,7 @@ export const UserList = (props: ListProps): React.ReactElement => {
         <TextField label="Last Name" source="lastName" />
         <TextField label="Username" source="username" />
         <TextField label="Roles" source="roles" />
+        <TextField label="age" source="age" />
       </Datagrid>
     </List>
   );

admin-ui/src/user/UserShow.tsx

@@ -18,6 +18,7 @@ export const UserShow = (props: ShowProps): React.ReactElement => {
         <TextField label="Last Name" source="lastName" />
         <TextField label="Username" source="username" />
         <TextField label="Roles" source="roles" />
+        <TextField label="age" source="age" />
       </SimpleShowLayout>
     </Show>
   );

server/prisma/schema.prisma

@@ -16,4 +16,5 @@ model User {
   username  String   @unique
   password  String
   roles     Json
+  age       String?
 }

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();
 

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 };

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 };

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 };

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 };

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 };

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 = {

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) {