From 8433645677f8f90a693893b8d04d718c223b9c62 Mon Sep 17 00:00:00 2001
From: jimini1026 <128363259+jimini1026@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:43:51 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EB=8B=A4=EB=A5=B8=EA=B3=BC=20=ED=81=AC?=
 =?UTF-8?q?=EB=A1=A4=EB=A7=81(=EC=8B=9D=ED=92=88=EC=98=81=EC=96=91?=
 =?UTF-8?q?=ED=95=99=EA=B3=BC,=20=ED=86=A0=EB=AA=A9=EA=B3=B5=ED=95=99?=
 =?UTF-8?q?=EA=B3=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/popup/popup.html |  2 ++
 manifest.json           |  7 ++++++-
 scripts/crawling.js     | 18 +++++++++++++++++-
 scripts/notification.js | 14 +++++++++++++-
 scripts/storage.js      |  1 +
 service-worker.js       |  4 ++--
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/assets/popup/popup.html b/assets/popup/popup.html
index d25ae91..71d57ac 100644
--- a/assets/popup/popup.html
+++ b/assets/popup/popup.html
@@ -75,6 +75,8 @@ <h2>학과 선택:</h2>
                 </button>
                 <div class="dropdown-content">
                     <div class="list Selected">정보컴퓨터공학부</div>
+                    <div class="list">식품영양학과</div>
+                    <div class="list">토목공학과</div>
                     <!-- <div class="list">의생명공학과</div>
                     <div class="list">기계공학과</div>
                     <div class="list">전기공학과</div>
diff --git a/manifest.json b/manifest.json
index aa72c32..e335edf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,12 @@
     "type": "module"
   },
   "permissions": ["scripting", "storage", "alarms", "notifications"],
-  "host_permissions": ["https://onestop.pusan.ac.kr/", "https://cse.pusan.ac.kr/cse/14651/subview.do"],
+  "host_permissions": [
+    "https://onestop.pusan.ac.kr/",
+    "https://cse.pusan.ac.kr/cse/14651/subview.do",
+    "https://fsn.pusan.ac.kr/fsn/15462/subview.do?enc=Zm5jdDF8QEB8JTJGYmJzJTJGZnNuJTJGMjc4MyUyRmFydGNsTGlzdC5kbyUzRmJic09wZW5XcmRTZXElM0QlMjZpc1ZpZXdNaW5lJTNEZmFsc2UlMjZzcmNoQ29sdW1uJTNEJTI2cGFnZSUzRDElMjZzcmNoV3JkJTNEJTI2cmdzQmduZGVTdHIlM0QlMjZiYnNDbFNlcSUzRCUyNnJnc0VuZGRlU3RyJTNEJTI2",
+    "https://civil.pusan.ac.kr/civil/16275/subview.do"
+  ],
   "action": {
     "default_popup": "/assets/popup/popup.html"
   },
diff --git a/scripts/crawling.js b/scripts/crawling.js
index 8abcf3c..92e3025 100644
--- a/scripts/crawling.js
+++ b/scripts/crawling.js
@@ -1,3 +1,5 @@
+import { localStorageGet } from './storage.js';
+
 async function getSchedules() {
   const { tabs } = await chrome.windows.create({
     url: 'https://onestop.pusan.ac.kr',
@@ -22,8 +24,22 @@ async function getSchedules() {
 }
 
 async function getMajorNotices() {
+  const MAJOR_NOTICE_URL = {
+    정보컴퓨터공학부: 'https://cse.pusan.ac.kr/cse/14651/subview.do',
+    식품영양학과:
+      'https://fsn.pusan.ac.kr/fsn/15462/subview.do?enc=Zm5jdDF8QEB8JTJGYmJzJTJGZnNuJTJGMjc4MyUyRmFydGNsTGlzdC5kbyUzRmJic09wZW5XcmRTZXElM0QlMjZpc1ZpZXdNaW5lJTNEZmFsc2UlMjZzcmNoQ29sdW1uJTNEJTI2cGFnZSUzRDElMjZzcmNoV3JkJTNEJTI2cmdzQmduZGVTdHIlM0QlMjZiYnNDbFNlcSUzRCUyNnJnc0VuZGRlU3RyJTNEJTI2',
+    토목공학과: 'https://civil.pusan.ac.kr/civil/16275/subview.do',
+  };
+  let majorNoticeUrl = MAJOR_NOTICE_URL['정보컴퓨터공학부'];
+  const { mymajor } = await localStorageGet('mymajor');
+  console.log(mymajor);
+
+  if (mymajor) {
+    majorNoticeUrl = MAJOR_NOTICE_URL[mymajor];
+    console.log(majorNoticeUrl);
+  }
   const { tabs } = await chrome.windows.create({
-    url: 'https://cse.pusan.ac.kr/cse/14651/subview.do',
+    url: majorNoticeUrl,
     state: 'minimized',
   });
 
diff --git a/scripts/notification.js b/scripts/notification.js
index fc87aa9..622d945 100644
--- a/scripts/notification.js
+++ b/scripts/notification.js
@@ -8,7 +8,8 @@ const createNotificationSignal = () => {
       // 팝업 설정 페이지에서 설정한 크롤링 주기를 이용하여 알람을 생성합니다.
       chrome.alarms.create('crawlingPeriod', {
         delayInMinutes: 0,
-        periodInMinutes: request.crawlingPeriod * 60,
+        // periodInMinutes: request.crawlingPeriod * 60,
+        periodInMinutes: 1,
       });
     }
   });
@@ -17,6 +18,7 @@ const createNotificationSignal = () => {
 const createDDayNotification = async () => {
   const aDay = 1000 * 60 * 60 * 24;
   chrome.storage.onChanged.addListener(async (changes) => {
+    console.log(changes);
     if (changes.todayDate || changes.noticeDDay) {
       const { schedules } = await localStorageGet('schedules');
       const { noticeDDay } = await localStorageGet('noticeDDay');
@@ -81,7 +83,10 @@ const updateStorageByAlarm = async () => {
 
 const createNotification = () => {
   const newNotice = [];
+  // 학과 변경시, 새로 크롤링한 데이터를 새로 등록된 공지로 인식 -> 알림 발생
+  // mymajor, 학과에 따른 공지데이터가 2차례 나눠서 들어옴
   chrome.storage.onChanged.addListener(async (changes) => {
+    console.log(changes);
     if (changes.fixedNotices) {
       if (changes.fixedNotices.oldValue) {
         for (let i = 0; i < changes.fixedNotices.newValue.length; i += 1) {
@@ -103,6 +108,13 @@ const createNotification = () => {
       }
     }
 
+    if (
+      newNotice.length ===
+      (changes.fixedNotices?.newValue.length || 0) + (changes.nonfixedNotices?.newValue.length || 0)
+    ) {
+      newNotice.length = 0;
+    }
+
     const { modalOnOff } = await chrome.storage.local.get('modalOnOff');
     if (modalOnOff && newNotice.length > 0) {
       for (let i = 0; i < newNotice.length; i += 1) {
diff --git a/scripts/storage.js b/scripts/storage.js
index b9de739..cfb6155 100644
--- a/scripts/storage.js
+++ b/scripts/storage.js
@@ -1,5 +1,6 @@
 const localStorageSet = (content) => {
   chrome.storage.local.set(content);
+  console.log(content);
 };
 
 const localStorageGet = (keys) => {
diff --git a/service-worker.js b/service-worker.js
index d4266eb..b78feea 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-param-reassign */
 import { getMajorNotices, getSchedules } from './scripts/crawling.js';
 import { createDDayNotification, createNotification, createNotificationSignal } from './scripts/notification.js';
-import { localStorageSet } from './scripts/storage.js';
+import { localStorageGet, localStorageSet } from './scripts/storage.js';
 
 // function openModal() {
 //   chrome.windows.create({
@@ -42,7 +42,7 @@ chrome.runtime.onInstalled.addListener(async ({ reason }) => {
       todayDate: new Date().getDate(),
       modalOnOff: true,
       noticeDDay: 3,
-      crawlingPeriod: 1,
+      crawlingPeriod: 3,
       mymajor: '정보컴퓨터공학부',
       initialStart: true,
     });