Fix optional embedded for manufacturer

demo/api/schema.gql

@@ -436,13 +436,13 @@ type AddressAsEmbeddable {
   streetNumber: Float
   zip: Float!
   country: String!
-  alternativeAddress: AlternativeAddressAsEmbeddable
+  alternativeAddress: AlternativeAddressAsEmbeddable!
 }
 
 type Manufacturer {
   id: ID!
   address: Address
-  addressAsEmbeddable: AddressAsEmbeddable
+  addressAsEmbeddable: AddressAsEmbeddable!
   updatedAt: DateTime!
 }
 
@@ -655,7 +655,7 @@ input AddressAsEmbeddableInput {
   streetNumber: Float
   zip: Float!
   country: String!
-  alternativeAddress: AlternativeAddressAsEmbeddableInput
+  alternativeAddress: AlternativeAddressAsEmbeddableInput!
 }
 
 input ProductDiscountsInput {
@@ -1329,7 +1329,7 @@ input ProductTagUpdateInput {
 
 input ManufacturerInput {
   address: AddressInput
-  addressAsEmbeddable: AddressAsEmbeddableInput
+  addressAsEmbeddable: AddressAsEmbeddableInput!
 }
 
 input ManufacturerUpdateInput {

demo/api/src/db/migrations/Migration20240223151902.ts

@@ -0,0 +1,20 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20240223151902 extends Migration {
+
+  async up(): Promise<void> {
+    this.addSql('delete from "Manufacturer";');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_street" type varchar(255) using ("addressAsEmbeddable_street"::varchar(255));');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_street" set not null;');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_zip" type int using ("addressAsEmbeddable_zip"::int);');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_zip" set not null;');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_country" type varchar(255) using ("addressAsEmbeddable_country"::varchar(255));');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_country" set not null;');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_alternativeAddress_street" type varchar(255) using ("addressAsEmbeddable_alternativeAddress_street"::varchar(255));');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_alternativeAddress_street" set not null;');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_alternativeAddress_zip" type int using ("addressAsEmbeddable_alternativeAddress_zip"::int);');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_alternativeAddress_zip" set not null;');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_alternativeAddress_country" type varchar(255) using ("addressAsEmbeddable_alternativeAddress_country"::varchar(255));');
+    this.addSql('alter table "Manufacturer" alter column "addressAsEmbeddable_alternativeAddress_country" set not null;');
+  }
+}

demo/api/src/products/entities/manufacturer.entity.ts

@@ -68,10 +68,10 @@ export class AlternativeAddressAsEmbeddable {
 @ObjectType()
 @InputType("AddressAsEmbeddableInput")
 export class AddressAsEmbeddable extends AlternativeAddressAsEmbeddable {
-    @Embedded(() => AlternativeAddressAsEmbeddable, { nullable: true })
-    @Field(() => AlternativeAddressAsEmbeddable, { nullable: true })
+    @Embedded(() => AlternativeAddressAsEmbeddable)
+    @Field(() => AlternativeAddressAsEmbeddable)
     @IsObject()
-    alternativeAddress?: AlternativeAddressAsEmbeddable = undefined;
+    alternativeAddress: AlternativeAddressAsEmbeddable;
 }
 
 @Entity()
@@ -88,9 +88,9 @@ export class Manufacturer extends BaseEntity<Manufacturer, "id"> {
     @Field(() => Address, { nullable: true })
     address?: Address = undefined;
 
-    @Embedded(() => AddressAsEmbeddable, { nullable: true })
-    @Field(() => AddressAsEmbeddable, { nullable: true })
-    addressAsEmbeddable?: AddressAsEmbeddable = undefined;
+    @Embedded(() => AddressAsEmbeddable) // Embedded can only be optional if all contained properties are optional
+    @Field(() => AddressAsEmbeddable)
+    addressAsEmbeddable: AddressAsEmbeddable;
 
     @Property({ onUpdate: () => new Date() })
     @Field()

demo/api/src/products/generated/dto/manufacturer.input.ts

@@ -3,7 +3,7 @@
 import { IsNullable, PartialType } from "@comet/cms-api";
 import { Field, InputType } from "@nestjs/graphql";
 import { Type } from "class-transformer";
-import { ValidateNested } from "class-validator";
+import { IsNotEmpty, ValidateNested } from "class-validator";
 
 import { Address, AddressAsEmbeddable } from "../../entities/manufacturer.entity";
 
@@ -15,11 +15,11 @@ export class ManufacturerInput {
     @Field(() => Address, { nullable: true })
     address?: Address;
 
-    @IsNullable()
+    @IsNotEmpty()
     @ValidateNested()
     @Type(() => AddressAsEmbeddable)
-    @Field(() => AddressAsEmbeddable, { nullable: true })
-    addressAsEmbeddable?: AddressAsEmbeddable;
+    @Field(() => AddressAsEmbeddable)
+    addressAsEmbeddable: AddressAsEmbeddable;
 }
 
 @InputType()