Add entities using the JDL model Coupons

.jhipster/Company.json

@@ -7,6 +7,10 @@
             "fieldValidateRules": [
                 "required"
             ]
+        },
+        {
+            "fieldName": "companyAddress",
+            "fieldType": "String"
         }
     ],
     "relationships": [

coupons.jh

@@ -1,13 +1,11 @@
 entity Company {
 	companyName String required 
-//    user Long required
+    companyAddress String 
 }
 entity Customer {
 	customerName String required
-//  user Long required
 }
 entity Coupon {
- //   company Long required
     title String required
     start Long required
     end Long required
@@ -17,20 +15,15 @@ entity Coupon {
     price Double required
     image String required
 }
-
 relationship ManyToMany {	
 	Customer{coupon} to Coupon{customer}  
 }
-
 relationship OneToOne {
 	Coupon   {company(id) } to Company
     Company  {user(login) } to User
     Customer {user(login) } to User
 }
-// Set pagination options
 paginate Company, Customer, Coupon with infinite-scroll
 dto * with mapstruct
-// Set service options to all except few
 service all with serviceImpl
-// Set an angular suffix
 angularSuffix * with mySuffix

src/main/java/io/github/jhipster/application/domain/Company.java

@@ -27,6 +27,9 @@ public class Company implements Serializable {
     @Column(name = "company_name", nullable = false)
     private String companyName;
 
+    @Column(name = "company_address")
+    private String companyAddress;
+
     @OneToOne
     @JoinColumn(unique = true)
     private User user;
@@ -53,6 +56,19 @@ public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
 
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public Company companyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+        return this;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+    }
+
     public User getUser() {
         return user;
     }
@@ -92,6 +108,7 @@ public String toString() {
         return "Company{" +
             "id=" + getId() +
             ", companyName='" + getCompanyName() + "'" +
+            ", companyAddress='" + getCompanyAddress() + "'" +
             "}";
     }
 }

src/main/java/io/github/jhipster/application/service/dto/CompanyDTO.java

@@ -14,6 +14,8 @@ public class CompanyDTO implements Serializable {
     @NotNull
     private String companyName;
 
+    private String companyAddress;
+
     private Long userId;
 
     private String userLogin;
@@ -34,6 +36,14 @@ public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
 
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -76,6 +86,7 @@ public String toString() {
         return "CompanyDTO{" +
             "id=" + getId() +
             ", companyName='" + getCompanyName() + "'" +
+            ", companyAddress='" + getCompanyAddress() + "'" +
             ", user=" + getUserId() +
             ", user='" + getUserLogin() + "'" +
             "}";

src/main/resources/config/liquibase/changelog/20180715055415_added_entity_Company.xml

@@ -25,6 +25,10 @@
             <column name="company_name" type="varchar(255)">
                 <constraints nullable="false" />
             </column>
+
+            <column name="company_address" type="varchar(255)">
+                <constraints nullable="true" />
+            </column>
             <column name="user_id" type="bigint">
                 <constraints unique="true" nullable="true" />
             </column>

src/main/webapp/app/entities/company-my-suffix/company-my-suffix-detail.component.html

@@ -9,6 +9,10 @@ <h2><span>Company</span> {{company.id}}</h2>
                 <dd>
                     <span>{{company.companyName}}</span>
                 </dd>
+                <dt><span>Company Address</span></dt>
+                <dd>
+                    <span>{{company.companyAddress}}</span>
+                </dd>
                 <dt><span>User</span></dt>
                 <dd>
                     {{company.userLogin}}

src/main/webapp/app/entities/company-my-suffix/company-my-suffix-update.component.html

@@ -20,6 +20,11 @@ <h2 id="jhi-company-my-suffix-heading">Create or edit a Company</h2>
                         </small>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="form-control-label" for="field_companyAddress">Company Address</label>
+                    <input type="text" class="form-control" name="companyAddress" id="field_companyAddress"
+                        [(ngModel)]="company.companyAddress" />
+                </div>
 
                 <div class="form-group">
                     <label class="form-control-label" for="field_user">User</label>

src/main/webapp/app/entities/company-my-suffix/company-my-suffix.component.html

@@ -16,6 +16,7 @@ <h2 id="page-heading">
             <tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" [callback]="reset.bind(this)">
             <th jhiSortBy="id"><span>ID</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="companyName"><span>Company Name</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="companyAddress"><span>Company Address</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="userLogin"><span>User</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th></th>
             </tr>
@@ -24,6 +25,7 @@ <h2 id="page-heading">
             <tr *ngFor="let company of companies ;trackBy: trackId">
                 <td><a [routerLink]="['/company-my-suffix', company.id, 'view' ]">{{company.id}}</a></td>
                 <td>{{company.companyName}}</td>
+                <td>{{company.companyAddress}}</td>
                 <td>
                     {{company.userLogin}}
                 </td>

src/main/webapp/app/shared/model/company-my-suffix.model.ts

@@ -1,10 +1,17 @@
 export interface ICompanyMySuffix {
     id?: number;
     companyName?: string;
+    companyAddress?: string;
     userLogin?: string;
     userId?: number;
 }
 
 export class CompanyMySuffix implements ICompanyMySuffix {
-    constructor(public id?: number, public companyName?: string, public userLogin?: string, public userId?: number) {}
+    constructor(
+        public id?: number,
+        public companyName?: string,
+        public companyAddress?: string,
+        public userLogin?: string,
+        public userId?: number
+    ) {}
 }

src/test/java/io/github/jhipster/application/web/rest/CompanyResourceIntTest.java

@@ -45,6 +45,9 @@ public class CompanyResourceIntTest {
     private static final String DEFAULT_COMPANY_NAME = "AAAAAAAAAA";
     private static final String UPDATED_COMPANY_NAME = "BBBBBBBBBB";
 
+    private static final String DEFAULT_COMPANY_ADDRESS = "AAAAAAAAAA";
+    private static final String UPDATED_COMPANY_ADDRESS = "BBBBBBBBBB";
+
     @Autowired
     private CompanyRepository companyRepository;
 
@@ -91,7 +94,8 @@ public void setup() {
      */
     public static Company createEntity(EntityManager em) {
         Company company = new Company()
-            .companyName(DEFAULT_COMPANY_NAME);
+            .companyName(DEFAULT_COMPANY_NAME)
+            .companyAddress(DEFAULT_COMPANY_ADDRESS);
         return company;
     }
 
@@ -117,6 +121,7 @@ public void createCompany() throws Exception {
         assertThat(companyList).hasSize(databaseSizeBeforeCreate + 1);
         Company testCompany = companyList.get(companyList.size() - 1);
         assertThat(testCompany.getCompanyName()).isEqualTo(DEFAULT_COMPANY_NAME);
+        assertThat(testCompany.getCompanyAddress()).isEqualTo(DEFAULT_COMPANY_ADDRESS);
     }
 
     @Test
@@ -169,7 +174,8 @@ public void getAllCompanies() throws Exception {
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
             .andExpect(jsonPath("$.[*].id").value(hasItem(company.getId().intValue())))
-            .andExpect(jsonPath("$.[*].companyName").value(hasItem(DEFAULT_COMPANY_NAME.toString())));
+            .andExpect(jsonPath("$.[*].companyName").value(hasItem(DEFAULT_COMPANY_NAME.toString())))
+            .andExpect(jsonPath("$.[*].companyAddress").value(hasItem(DEFAULT_COMPANY_ADDRESS.toString())));
     }
 
 
@@ -184,7 +190,8 @@ public void getCompany() throws Exception {
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
             .andExpect(jsonPath("$.id").value(company.getId().intValue()))
-            .andExpect(jsonPath("$.companyName").value(DEFAULT_COMPANY_NAME.toString()));
+            .andExpect(jsonPath("$.companyName").value(DEFAULT_COMPANY_NAME.toString()))
+            .andExpect(jsonPath("$.companyAddress").value(DEFAULT_COMPANY_ADDRESS.toString()));
     }
     @Test
     @Transactional
@@ -207,7 +214,8 @@ public void updateCompany() throws Exception {
         // Disconnect from session so that the updates on updatedCompany are not directly saved in db
         em.detach(updatedCompany);
         updatedCompany
-            .companyName(UPDATED_COMPANY_NAME);
+            .companyName(UPDATED_COMPANY_NAME)
+            .companyAddress(UPDATED_COMPANY_ADDRESS);
         CompanyDTO companyDTO = companyMapper.toDto(updatedCompany);
 
         restCompanyMockMvc.perform(put("/api/companies")
@@ -220,6 +228,7 @@ public void updateCompany() throws Exception {
         assertThat(companyList).hasSize(databaseSizeBeforeUpdate);
         Company testCompany = companyList.get(companyList.size() - 1);
         assertThat(testCompany.getCompanyName()).isEqualTo(UPDATED_COMPANY_NAME);
+        assertThat(testCompany.getCompanyAddress()).isEqualTo(UPDATED_COMPANY_ADDRESS);
     }
 
     @Test

src/test/javascript/e2e/entities/company-my-suffix/company-my-suffix.page-object.ts

@@ -18,6 +18,7 @@ export class CompanyUpdatePage {
     saveButton = element(by.id('save-entity'));
     cancelButton = element(by.id('cancel-save'));
     companyNameInput = element(by.id('field_companyName'));
+    companyAddressInput = element(by.id('field_companyAddress'));
     userSelect = element(by.id('field_user'));
 
     getPageTitle() {
@@ -32,6 +33,14 @@ export class CompanyUpdatePage {
         return this.companyNameInput.getAttribute('value');
     }
 
+    setCompanyAddressInput(companyAddress): promise.Promise<void> {
+        return this.companyAddressInput.sendKeys(companyAddress);
+    }
+
+    getCompanyAddressInput() {
+        return this.companyAddressInput.getAttribute('value');
+    }
+
     userSelectLastOption(): promise.Promise<void> {
         return this.userSelect
             .all(by.tagName('option'))

src/test/javascript/e2e/entities/company-my-suffix/company-my-suffix.spec.ts

@@ -32,6 +32,8 @@ describe('Company e2e test', () => {
         companyComponentsPage.clickOnCreateButton();
         companyUpdatePage.setCompanyNameInput('companyName');
         expect(companyUpdatePage.getCompanyNameInput()).toMatch('companyName');
+        companyUpdatePage.setCompanyAddressInput('companyAddress');
+        expect(companyUpdatePage.getCompanyAddressInput()).toMatch('companyAddress');
         companyUpdatePage.userSelectLastOption();
         companyUpdatePage.save();
         expect(companyUpdatePage.getSaveButton().isPresent()).toBeFalsy();