1.0 patch 22 add msg type

MuuuShin · Dec 3, 2023 · f1fab64 · f1fab64
1 parent 388b533
commit f1fab64
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/cse/ooad/project/controller/AuthController.java b/src/main/java/cse/ooad/project/controller/AuthController.java
@@ -30,7 +30,7 @@ public Result<String> login(@RequestBody Map<String, Object> jsonMap) {
         if (isTeacher) {
             Teacher result = loginService.loginTeacher(username, password);
             if (result == null) {
-                log.info(username + "Invalid username or password");
+                log.info(username + " Invalid username or password");
                 return Result.error("Invalid username or password");
             }
             Map<String, Object> claims = new HashMap<>();

diff --git a/src/main/java/cse/ooad/project/model/Msg.java b/src/main/java/cse/ooad/project/model/Msg.java
@@ -12,6 +12,7 @@
  * 属性列表：
  * <ul>
  *   <li>msgId: 消息的唯一标识。</li>
+ *   <li>type: 消息的类型。枚举类参见{@link cse.ooad.project.utils.MessageType}</li>
  *   <li>srcId: 消息发送者的标识。如果为0则为系统消息(System)</li>
  *   <li>dstId: 消息接收者的标识。</li>
  *   <li>body: 消息内容。</li>
@@ -26,12 +27,15 @@
 @NoArgsConstructor
 @Entity
 @Table(name = "msgs", schema = "public", catalog = "cs309a")
-public class                                                               Msg {
+public class Msg {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
     @Column(name = "msg_id")
     private Long msgId;
     @Basic
+    @Column(name = "type")
+    private int type;
+    @Basic
     @Column(name = "src_id")
     private Long srcId;
     @Basic

diff --git a/src/main/java/cse/ooad/project/utils/MessageType.java b/src/main/java/cse/ooad/project/utils/MessageType.java
@@ -0,0 +1,10 @@
+package cse.ooad.project.utils;
+
+public enum MessageType {
+    MSG(0),APPLY(1);
+
+    public final int typeCode;
+    MessageType(int typeCode){
+        this.typeCode = typeCode;
+    }
+}
diff --git a/src/test/java/cse/ooad/project/Cs30923FallProjectApplicationTests.java b/src/test/java/cse/ooad/project/Cs30923FallProjectApplicationTests.java
@@ -156,7 +156,7 @@ void LoginTest() {
     @Order(7)
     @Test
     void MsgTest() {
-        Msg msg = new Msg(null, 1L, 2L, "罗启航牛逼", new Timestamp(12315616L), 12);
+        Msg msg = new Msg(null,0, 1L, 2L, "罗启航牛逼", new Timestamp(12315616L), 12);
         msgService.saveMsg(msg);
     }
 

diff --git a/src/test/resources/DDL-no-f.sql b/src/test/resources/DDL-no-f.sql
@@ -140,6 +140,7 @@ create table if not exists public.msgs
 (
     msg_id    bigint generated always as identity
         primary key,
+    type    integer,
     src_id    bigint,
     dst_id    bigint,
     body      varchar(255),

diff --git a/src/test/resources/DDL.sql b/src/test/resources/DDL.sql
@@ -154,6 +154,7 @@ create table if not exists public.msgs
 (
     msg_id    bigint generated always as identity
         primary key,
+    type    integer,
     src_id    bigint,
     dst_id    bigint,
     body      varchar(255),