Skip to content
Extraits de code Groupes Projets
Valider 034a290b rédigé par karima hamdan's avatar karima hamdan
Parcourir les fichiers

missing attributes have been added in Maintenance and MaintenanceActivity and...

missing attributes  have been added in Maintenance and MaintenanceActivity and also fixing the map association between cancellationrequest and singlereservation and add a missing attribute in clientDto and making documents with no expiration date to always be valid instead of null
  .
parents 2e682639 754bb0f8
Branches
Étiquettes
1 requête de fusion!37MLC-311 "Feature/adding some missing attributes in Maintenance and maintenanceActivty entities"
Pipeline #21850 réussi avec les étapes
in 2 minutes et 34 secondes
## [0.0.34-RELEASE]
## [0.0.35-RELEASE]
### Added
- missing attributes have been added in Maintenance and MaintenanceActivity.
- missing attributes have been added in Maintenance and MaintenanceActivity and also fixing the map association between cancellationrequest and singlereservation and add a missing attribute in clientDto and making documents with no expiration date to always be valid instead of null
.
### Changed
- Changes in existing functionality.
......@@ -14,6 +15,24 @@
### Fixed
- Any bug fixes.
### Security
- Any security improvements.
## [0.0.34-RELEASE]
### Added
- add new enum.
### Changed
- update cancellationRequest model and StatusCancellation enum .
### Deprecated
- Soon-to-be removed features.
### Removed
- Features that have been removed.
### Fixed
- Any bug fixes.
### Security
- Any security improvements.
## [0.0.33-RELEASE]
......
......@@ -10,7 +10,7 @@
</parent>
<groupId>com.marketingconfort</groupId>
<artifactId>mobiloca-common</artifactId>
<version>0.0.34-SNAPSHOT</version>
<version>0.0.35-SNAPSHOT</version>
<name>mobiloca-common</name>
<description>mobiLoca common project</description>
<url/>
......
package com.marketingconfort.mobiloca.common.Reservation.enums;
public enum CancellationReasonType {
CHANGE_OF_SCHEDULE,
WEATHER_CONDITIONS,
UNEXPECTED_WORK,
CHILD_CUSTODY_PROBLEM,
TRAVEL_DELAYS,
OTHERS
}
......@@ -2,6 +2,5 @@ package com.marketingconfort.mobiloca.common.Reservation.enums;
public enum StatusCancellation {
PENDING,
APPROVED,
REJECTED
TREATED
}
package com.marketingconfort.mobiloca.common.Reservation.models;
import com.marketingconfort.mobiloca.common.Reservation.enums.CancellationReasonType;
import com.marketingconfort.mobiloca.common.Reservation.enums.StatusCancellation;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
......@@ -19,13 +20,14 @@ public class CancellationRequest {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long cancellationId;
private String cancellationNumber;
private Long globalReservationId;
private LocalDate dateCancellation;
private String cancellationReason;
private String rejectionReason;
private Double totalAmount;
@Enumerated(EnumType.STRING)
private CancellationReasonType cancellationReason;
private String cancellationDetails;
@Enumerated(EnumType.STRING)
private StatusCancellation status;
......@@ -34,6 +36,8 @@ public class CancellationRequest {
@JoinColumn(name = "single_reservation_id")
private SingleReservation singleReservation;
private Long ClientId;
}
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter