Update form group name to conform to Name interface

apps/baseline/src/app/app.component.html

@@ -1,5 +1,5 @@
 <form *ngIf="form" [formGroup]="form">
-  <ng-container formGroupName="nameGroup">
+  <ng-container formGroupName="name">
     <div>
       <label for="firstName">First Name: </label>
       <input name="firstName" formControlName="firstName">

apps/global-form/src/app/app.component.html

@@ -1,5 +1,5 @@
 <form [formGroup]="form">
-  <nested-forms-name [nameGroup]="form.get('nameGroup')"></nested-forms-name>
+  <nested-forms-name [nameGroup]="form.get('name')"></nested-forms-name>
   <nested-forms-address-list [addressArray]="form.get('addresses')"></nested-forms-address-list>
 </form>
 <hr />

libs/contact/src/index.ts

@@ -1,4 +1,4 @@
 export * from './lib/contact-model';
-export * from './lib/contact.service';
+export * from './lib/services/contact.service';
 export * from './lib/services/contact-form.service';
 export * from './lib/contact.module';

libs/contact/src/lib/contact-model.ts

@@ -1,20 +1,20 @@
 export interface Name {
-  firstName?: string;
+  firstName: string;
-  lastName?: string;
+  lastName: string;
-  middleName?: string;
+  middleName: string;
-  prefix?: string;
+  prefix: string;
-  suffix?: string;
+  suffix: string;
 }
 
 export interface Address {
-  line_1?: string;
+  line_1: string;
-  line_2?: string;
+  line_2: string;
-  city?: string;
+  city: string;
-  state?: string;
+  state: string;
-  postalCode?: string;
+  postalCode: string;
 }
 
 export interface Contact {
-  name?: Name;
+  name: Name;
-  addresses?: Address[];
+  addresses: Address[];
 }

libs/contact/src/lib/contact.module.ts

@@ -1,6 +1,6 @@
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ContactService } from './contact.service';
+import { ContactService } from './services/contact.service';
 import { ContactFormService } from './services/contact-form.service';
 
 @NgModule({

libs/contact/src/lib/services/contact-form.service.ts

@@ -14,7 +14,7 @@ export class ContactFormService {
     const addresses: FormArray = this.fb.array([]);
 
     const group = this.fb.group({
-      nameGroup: this.fb.group({
+      name: this.fb.group({
         firstName: [name ? name.firstName : ''],
         lastName: [name ? name.lastName : ''],
         middleName: [name ? name.middleName : ''],

libs/contact/src/lib/services/contact.service.spec.ts

@@ -1,4 +1,4 @@
-import { Contact } from './contact-model';
+import { Contact } from '../contact-model';
 import { TestBed, async } from '@angular/core/testing';
 
 import { ContactService } from './contact.service';

libs/contact/src/lib/services/contact.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { Contact } from './contact-model';
+import { Contact } from '../contact-model';
 import { Observable, of } from 'rxjs';
 
 const contact: Contact = {
@@ -14,12 +14,14 @@ const contact: Contact = {
   addresses: [
     {
       line_1: '123 Main Street',
+      line_2: null,
       city: 'New York',
       state: 'NY',
       postalCode: '12345',
     },
     {
       line_1: '123 South Street',
+      line_2: null,
       city: 'Boston',
       state: 'MA',
       postalCode: '54321',