Skip to content

Commit

Permalink
code refactor, fixing performance issues
Browse files Browse the repository at this point in the history
  • Loading branch information
abdelhak-zaaim committed Apr 29, 2024
1 parent 4de10e8 commit 85f311d
Show file tree
Hide file tree
Showing 19 changed files with 182 additions and 95 deletions.
13 changes: 9 additions & 4 deletions src/main/java/com/suivi/colis/suivicolis/entities/Address.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@

import com.suivi.colis.suivicolis.utils.helpers.DateUtils;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Date;
import java.util.Objects;

@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity
@NoArgsConstructor
@AllArgsConstructor
Expand Down Expand Up @@ -81,4 +84,6 @@ protected void onCreated() {
protected void onUpdate() {
this.lastUpdateDate = DateUtils.getCurrentDateWithSpecifiedTimeZone();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@
import jakarta.persistence.ManyToOne;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Data

@Entity
@DiscriminatorValue(Role.ADMIN_EMPLOYEE_ROLE)
public class AdminEmployee extends Employee {

@ManyToOne
private PrivilegesGroup privilegesGroup;

@ManyToOne
private PrivilegesGroup privilegesGroup;


}
15 changes: 10 additions & 5 deletions src/main/java/com/suivi/colis/suivicolis/entities/Agency.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,22 @@
package com.suivi.colis.suivicolis.entities;

import com.suivi.colis.suivicolis.models.MapsLocationPoint;
import com.suivi.colis.suivicolis.validations.location.ValidMapsLocationPoint;
import com.suivi.colis.suivicolis.utils.helpers.DateUtils;
import com.suivi.colis.suivicolis.validations.location.ValidMapsLocationPoint;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Date;
import java.util.Objects;
import java.util.Set;

@NoArgsConstructor
@AllArgsConstructor
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity

public class Agency {
Expand All @@ -44,6 +47,7 @@ public class Agency {
private String agencyContactNumber;
private String agencyEmail;
@OneToMany(mappedBy = "associatedAgency")
@ToString.Exclude
private Set<AgencyEmployee> agencyEmployees;
@Temporal(TemporalType.TIMESTAMP)
private Date creationDate;
Expand Down Expand Up @@ -72,4 +76,5 @@ protected void onUpdate() {
this.lastUpdateDate = DateUtils.getCurrentDateWithSpecifiedTimeZone();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,20 @@

package com.suivi.colis.suivicolis.entities;

import com.suivi.colis.suivicolis.models.enums.Role;
import com.suivi.colis.suivicolis.models.enums.AgencyEmployeeRole;
import com.suivi.colis.suivicolis.models.enums.Role;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Objects;

@NoArgsConstructor
@AllArgsConstructor
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity
@DiscriminatorValue(Role.AGENCY_EMPLOYEE_ROLE)
public class AgencyEmployee extends Employee {
Expand All @@ -51,5 +55,4 @@ public class AgencyEmployee extends Employee {
@Enumerated(EnumType.STRING)
private AgencyEmployeeRole agencyEmployeeRole;


}
16 changes: 10 additions & 6 deletions src/main/java/com/suivi/colis/suivicolis/entities/Customer.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,20 @@
package com.suivi.colis.suivicolis.entities;

import com.suivi.colis.suivicolis.models.enums.Role;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.List;
import java.util.Objects;

@NoArgsConstructor
@AllArgsConstructor
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity
@DiscriminatorValue(Role.CUSTOMER_ROLE)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@

import com.suivi.colis.suivicolis.utils.helpers.DateUtils;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Date;
import java.util.Objects;

@Entity
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
public class DeliveryAddress {
Expand Down Expand Up @@ -88,4 +91,5 @@ protected void onUpdate() {
this.lastUpdateDate = DateUtils.getCurrentDateWithSpecifiedTimeZone();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@

package com.suivi.colis.suivicolis.entities;

import com.suivi.colis.suivicolis.models.MapsLocationPoint;
import com.suivi.colis.suivicolis.entities.converters.ListLocationPointListConverter;
import com.suivi.colis.suivicolis.models.MapsLocationPoint;
import com.suivi.colis.suivicolis.utils.helpers.DateUtils;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.List;
import java.util.Objects;

@NoArgsConstructor
@AllArgsConstructor
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity
public class DeliveryArea {

Expand All @@ -38,6 +42,7 @@ public class DeliveryArea {
private List<MapsLocationPoint> areaVertices;

@ManyToOne(fetch = FetchType.LAZY)
@ToString.Exclude
private AdminEmployee createdBy;

@Temporal(TemporalType.TIMESTAMP)
Expand All @@ -57,4 +62,5 @@ protected void onUpdate() {
this.lastUpdateDate = DateUtils.getCurrentDateWithSpecifiedTimeZone();
}


}
16 changes: 10 additions & 6 deletions src/main/java/com/suivi/colis/suivicolis/entities/DeliveryMan.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@
package com.suivi.colis.suivicolis.entities;

import com.suivi.colis.suivicolis.models.MapsLocationPoint;
import com.suivi.colis.suivicolis.validations.location.ValidMapsLocationPoint;
import com.suivi.colis.suivicolis.models.enums.Role;
import com.suivi.colis.suivicolis.models.enums.VehicleType;
import com.suivi.colis.suivicolis.validations.location.ValidMapsLocationPoint;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import com.suivi.colis.suivicolis.models.enums.Role;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Objects;


@NoArgsConstructor
@AllArgsConstructor
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity

@DiscriminatorValue(Role.DELIVERY_MAN_ROLE)
Expand Down
13 changes: 9 additions & 4 deletions src/main/java/com/suivi/colis/suivicolis/entities/Employee.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@

import com.suivi.colis.suivicolis.models.enums.Role;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Objects;

@NoArgsConstructor
@AllArgsConstructor
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@Entity
@DiscriminatorValue(Role.EMPLOYEE_ROLE)
public class Employee extends User {
Expand All @@ -34,4 +38,5 @@ public class Employee extends User {
@JoinColumn(name = "assigned_by")
private AdminEmployee assignedBy;


}
12 changes: 8 additions & 4 deletions src/main/java/com/suivi/colis/suivicolis/entities/LoginLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@
package com.suivi.colis.suivicolis.entities;

import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Date;
@Data
import java.util.Objects;

@Getter
@Setter
@ToString
@RequiredArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@Entity
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/com/suivi/colis/suivicolis/entities/Parcel.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@
import com.suivi.colis.suivicolis.models.enums.ParcelStatus;
import com.suivi.colis.suivicolis.models.enums.ParcelType;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.CreationTimestamp;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
import java.util.Objects;


@Entity
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
public class Parcel {
Expand All @@ -50,6 +51,7 @@ public class Parcel {
private Date deleveryDate;

@OneToMany
@ToString.Exclude
private List<ParcelHistory> parcelHistories;

@ManyToOne
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@

package com.suivi.colis.suivicolis.entities;

import com.suivi.colis.suivicolis.models.ParcelLocation;
import com.suivi.colis.suivicolis.entities.converters.ParcelLocationConverter;
import com.suivi.colis.suivicolis.models.ParcelLocation;
import com.suivi.colis.suivicolis.utils.helpers.DateUtils;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Date;
import java.util.Objects;

@Entity
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
public class ParcelHistory {
Expand All @@ -49,4 +52,5 @@ protected void onCreated() {

}


}
12 changes: 8 additions & 4 deletions src/main/java/com/suivi/colis/suivicolis/entities/Payment.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@

import com.suivi.colis.suivicolis.models.enums.PaymentMethod;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;

import java.util.Objects;

@Entity
@Data
@Getter
@Setter
@ToString
@RequiredArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
public class Payment {
Expand Down
Loading

0 comments on commit 85f311d

Please sign in to comment.