Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/org/example/alfs/entities/Attachment.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
Stores metadata about the file and the file reference s3key.
*/
@Entity
@Table(name = "attachment")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class Attachment {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(nullable = false)
Expand All @@ -33,6 +34,7 @@ public void prePersist() {
uploadedAt = LocalDateTime.now();
}

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "ticket_id", nullable = false)
private Ticket ticket;
}
4 changes: 3 additions & 1 deletion src/main/java/org/example/alfs/entities/AuditLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
public class AuditLog {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Enumerated(EnumType.STRING)
@Column(nullable = false, length = 50)
private AuditAction action;

@Column(nullable = false)
private String fieldName;

@Column(length = 4000)
Expand All @@ -35,6 +36,7 @@ public class AuditLog {
@Column(length = 4000)
private String newValue;

@Column(nullable = false)
private LocalDateTime createdAt;

@PrePersist
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/example/alfs/entities/Ticket.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import lombok.*;
import org.example.alfs.enums.TicketStatus;


import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
Expand All @@ -23,14 +22,14 @@
public class Ticket {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(nullable = false, length = 255)
@Column(nullable = false, length = 255, updatable = false)
private String title;

@Basic(fetch = FetchType.LAZY)
@Column(nullable = false, columnDefinition="TEXT")
@Column(nullable = false, columnDefinition = "TEXT", updatable = false)
private String description;

@Enumerated(EnumType.STRING)
Expand All @@ -48,7 +47,8 @@ public class Ticket {
public void prePersist() {
createdAt = LocalDateTime.now();
if (status == null) status = TicketStatus.OPEN;
if (reporterToken == null || reporterToken.isBlank()) reporterToken = UUID.randomUUID().toString(); // Skapa token för anonyma anmälare
if (reporterToken == null || reporterToken.isBlank())
reporterToken = UUID.randomUUID().toString(); // Skapa token för anonyma anmälare
}

@PreUpdate
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/org/example/alfs/entities/TicketComment.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
public class TicketComment {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Basic(fetch = FetchType.LAZY)
@Column(nullable = false, columnDefinition="TEXT")
@Column(nullable = false, columnDefinition = "TEXT")
private String message;

// Möjlighet att skriva internt meddelande (synligt för utredare/admin, inte för anmälare)
@Column(nullable = false)
private boolean isInternalNote = false;
private boolean internalNote = false;

private LocalDateTime createdAt;

Expand All @@ -37,9 +37,11 @@ public void prePersist() {
createdAt = LocalDateTime.now();
}

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "ticket_id", nullable = false)
private Ticket ticket;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "author_id", nullable = true)
private User author;
}
2 changes: 1 addition & 1 deletion src/main/java/org/example/alfs/entities/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
@NoArgsConstructor
public class User {

@GeneratedValue
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(nullable = false, unique = true, length = 100)
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/example/alfs/enums/AuditAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

public enum AuditAction {
CREATED,
UPDATED,
STATUS_CHANGED,
ASSIGNED,
COMMENTED
UNASSIGNED,
COMMENT_ADDED,
ATTACHMENT_ADDED
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ public interface TicketCommentRepository extends JpaRepository<TicketComment, Lo
List<TicketComment> findByTicketIdOrderByCreatedAtAsc(Long ticketId);

// Ladda interna meddelanden för utredare/admins, äldst först
List<TicketComment> findByTicketIdAndIsInternalNoteOrderByCreatedAtAsc(Long ticketId, boolean isInternalNote);
List<TicketComment> findByTicketIdAndInternalNoteOrderByCreatedAtAsc(Long ticketId, boolean isInternalNote);
}
Loading