Changeset 62bba0c for src/main/java/com/example/skychasemk/model

Timestamp:

02/23/25 20:37:56 (4 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

fda671c

Parents:

de83113

git-author:

ste08 <sjovanoska@…> (02/23/25 20:37:23)

git-committer:

ste08 <sjovanoska@…> (02/23/25 20:37:56)

Message:

Report working, Wishlist partly working.

Location:

src/main/java/com/example/skychasemk/model

Files:

• SupportTicket.java (modified) (5 diffs)
• TopMonthlyReport.java (modified) (1 diff)
• TopMonthlyReportId.java (added)
• WebConfig.java (modified) (1 diff)
• Wishlist.java (modified) (2 diffs)

src/main/java/com/example/skychasemk/model/SupportTicket.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.time.LocalDate;
@@ -10 +11 @@
 public class SupportTicket {
 
+    @Setter
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -15 +17 @@
 
     private Integer ticketID;
+    @Setter
     @Getter
-    @Column(name = "UserID")
+    @Column(name = "userid")
 
-    private Integer userID;
+    private Integer userId;
 
+    @Setter
     @Getter
     @Column(name = "Description")
 
     private String description;
+    @Setter
+
     @Getter
     @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private TicketStatus status;
+    @Setter
     @Column(name = "date_created")
 
     private LocalDate dateCreated;
+    @Setter
     @Getter
     @Column(name = "date_resolved")
 
     private LocalDate dateResolved;
+    @Setter
     @Column(name = "assigned_to")
 
@@ -44 +53 @@
     }
 
-    public TicketStatus getStatus() {
-        return status;
-    }
-
-    public Integer getTicketID() {
-        return ticketID;
-    }
-
-    public void setTicketID(Integer ticketID) {
-        this.ticketID = ticketID;
-    }
-
-    public void setUserID(Integer userID) {
-        this.userID = userID;
-    }
-
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setStatus(TicketStatus status) {
-        this.status = status;
-    }
 
     public LocalDate getDateCreated(LocalDate now) {
@@ -73 +58 @@
     }
 
-    public void setDateCreated(LocalDate dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    public void setDateResolved(LocalDate dateResolved) {
-        this.dateResolved = dateResolved;
-    }
-
-    public void setAssignedTo(Integer assignedTo) {
-        this.assignedTo = assignedTo;
-    }
 }

src/main/java/com/example/skychasemk/model/TopMonthlyReport.java

@@ -1 +1 @@
 package com.example.skychasemk.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.Immutable;
 
 import java.time.LocalDate;
-
+@Setter
+@Getter
 @Entity
 @Table(name="topmonhtlyreport")
+@IdClass(TopMonthlyReportId.class) // Define composite key
+
 public class TopMonthlyReport {
+    // Getters and Setters
     @Id
     @Column(name = "month")
     private LocalDate month;
-
+    @Id
     @Column(name = "category")
     private String category;
-
+    @Id
     @Column(name = "name")
     private String name;
-
     @Column(name = "count")
     private int count;
 
-    // Getters and Setters
-    public LocalDate getMonth() {
-        return month;
-    }
-
-    public void setMonth(LocalDate month) {
-        this.month = month;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
 }

src/main/java/com/example/skychasemk/model/WebConfig.java

@@ -34 +34 @@
         registry.addViewController("/transaction").setViewName("forward:/TransactionPage.html");
         registry.addViewController("/login").setViewName("forward:/UserLogin.html");
-        registry.addViewController("/wishlist").setViewName("forward:/WishlistPage.html");
+        registry.addViewController("/wishlist").setViewName("forward:/Wishlist.html");
         registry.addViewController("/signup").setViewName("forward:/UserSignup.html");
+        registry.addViewController("/views").setViewName("forward:/ViewReport.html");
     }
 

src/main/java/com/example/skychasemk/model/Wishlist.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.time.LocalDate;
@@ -16 +17 @@
 
     private Integer wishlistID;
-    @Column(name = "userId")
+    @Setter
+    @Column(name = "userid")
 
-    private Integer userID;
-    @Column(name = "targetId")
+    private Integer userId;
+    @Setter
+    @Column(name = "targetid")
 
-    private Integer targetID;
+    private Integer targetId;
+    @Setter
+    @Getter
     @Column(name = "date_added")
+    private LocalDate date_added;
 
-    private LocalDate dateAdded;
 
-    public Integer getWishlistID() {
-        return wishlistID;
-    }
-
-    public void setWishlistID(Integer wishlistID) {
-        this.wishlistID = wishlistID;
-    }
-
-    public Integer getUserID() {
-        return userID;
-    }
-
-    public void setUserID(Integer userID) {
-        this.userID = userID;
-    }
-
-    public Integer getTargetID() {
-        return targetID;
-    }
-
-    public void setTargetID(Integer targetID) {
-        this.targetID = targetID;
-    }
-
-    public LocalDate getDateAdded() {
-        return dateAdded;
-    }
-
-    public void setDateAdded(LocalDate dateAdded) {
-        this.dateAdded = dateAdded;
-    }
 }