Merge pull request #4 from wileyday/main

예약 발송 기능 추가

Author: wileyday

.gitignore

@@ -1,2 +1,3 @@
 config.json
 db.json
+logs/

agent.go

@@ -190,7 +190,7 @@ func getAPIConfig(homedir string, apiconf *APIConfig) error {
 func pollMsg() {
   for {
     time.Sleep(time.Second * 1)
-    rows, err := db.Query("SELECT id, payload FROM msg WHERE sent = false AND createdAt >= SUBDATE(NOW(), INTERVAL 24 HOUR) AND sendAttempts < 3 LIMIT 10000")
+    rows, err := db.Query("SELECT id, payload FROM msg WHERE sent = false AND scheduledAt <= NOW() AND scheduledAt >= SUBDATE(NOW(), INTERVAL 24 HOUR) AND sendAttempts < 3 LIMIT 10000")
     if err != nil {
       errlog.Println("[메시지발송] DB Query ERROR:", err)
       time.Sleep(time.Second * 5)

create_table.sql

@@ -1,9 +1,10 @@
 CREATE TABLE msg (
   id integer  AUTO_INCREMENT primary key,
-  createdAt DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updatedAt DATETIME DEFAULT CURRENT_TIMESTAMP,
-  sendAttempts SMALLINT DEFAULT 0,
-  reportAttempts SMALLINT DEFAULT 0,
+  createdAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updatedAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  scheduledAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  sendAttempts SMALLINT NOT NULL DEFAULT 0,
+  reportAttempts SMALLINT NOT NULL DEFAULT 0,
   `to` VARCHAR(20) AS (payload->>'$.to') STORED,
   `from` VARCHAR(20) AS (payload->>'$.from') STORED,
   groupId VARCHAR(255) AS (result->>'$.groupId') STORED,
@@ -13,9 +14,10 @@ CREATE TABLE msg (
   statusMessage VARCHAR(255) AS (result->>'$.statusMessage') STORED,
   payload JSON,
   result JSON default NULL,
-  sent BOOLEAN default false,
+  sent BOOLEAN NOT NULL default false,
   KEY (`createdAt`),
   KEY (`updatedAt`),
+  KEY (`scheduledAt`),
   KEY (`sendAttempts`),
   KEY (`reportAttempts`),
   KEY (`to`),

create_table_maria.sql

@@ -1,9 +1,10 @@
 CREATE TABLE msg (
   id integer  AUTO_INCREMENT primary key,
-  createdAt DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updatedAt DATETIME DEFAULT CURRENT_TIMESTAMP,
-  sendAttempts SMALLINT DEFAULT 0,
-  reportAttempts SMALLINT DEFAULT 0,
+  createdAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updatedAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  scheduledAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  sendAttempts SMALLINT NOT NULL DEFAULT 0,
+  reportAttempts SMALLINT NOT NULL DEFAULT 0,
   `to` VARCHAR(20) AS (JSON_UNQUOTE(JSON_EXTRACT(payload, '$.to'))) STORED,
   `from` VARCHAR(20) AS (JSON_UNQUOTE(JSON_EXTRACT(payload, '$.from'))) STORED,
   groupId VARCHAR(255) AS (JSON_UNQUOTE(JSON_EXTRACT(result, '$.groupId'))) STORED,
@@ -13,15 +14,17 @@ CREATE TABLE msg (
   statusMessage VARCHAR(255) AS (JSON_UNQUOTE(JSON_EXTRACT(result, '$.statusMessage'))) STORED,
   payload JSON,
   result JSON default NULL,
-  sent BOOLEAN default false,
+  sent BOOLEAN NOT NULL default false,
   KEY (`createdAt`),
   KEY (`updatedAt`),
+  KEY (`scheduledAt`),
   KEY (`sendAttempts`),
   KEY (`reportAttempts`),
   KEY (`to`),
   KEY (`from`),
   KEY (groupId),
   KEY (messageId),
+  KEY (status),
   KEY (statusCode),
   KEY (sent)
 ) DEFAULT CHARSET=utf8mb4;

samples.sql

@@ -2,14 +2,14 @@
 INSERT INTO msg(payload) VALUES(json_object(
   'to', '01000000001',
   'from', '020000001',
-  'text', '테스트 메시지',
+  'text', '테스트 메시지'
 ));
 
 -- LMS 발송
 INSERT INTO msg(payload) VALUES(json_object(
   'to', '01000000001',
   'from', '020000001',
-  'text', '한글 45자, 영자 90자 이상 입력되면 자동으로 LMS타입의 문자메시지가 발송됩니다. 0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+  'text', '한글 45자, 영자 90자 이상 입력되면 자동으로 LMS타입의 문자메시지가 발송됩니다. 0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 ));
 
 -- MMS 발송(JPG 이미지 파일 상대경로 입력 시 /opt/agent/files/ 아래 파일)
@@ -71,3 +71,13 @@ INSERT INTO msg(payload) VALUES(json_object(
     ))
   )
 ));
+
+-- 발송 예약 (2021년 3월 26일 12시 20분에 발송 예약)
+INSERT INTO msg(scheduledAt, payload) VALUES(
+  '2021-03-26 12:20:00',
+  json_object(
+    'to', '01000000001',
+    'from', '020000001',
+    'text', '테스트 메시지'
+  )
+);