v1.0.0

🚀 Feature Updates - 앱이 Foreground에 있어도 알림이 오게끔 지원 🔧 Bug Fixes - 목표 가격 설정 범위가 0~999999999 사이에서 설정되도록 수정 - 상품 상세 페이지 제목 최대 줄 수를 3줄로 변경 Co-Authored-By: EunhoKang <[email protected]> Co-Authored-By: ootr47 <[email protected]> Co-Authored-By: 손문기 <[email protected]> Co-Authored-By: ByeongIk Choi <[email protected]>
boostcampwm2023 · Dec 14, 2023 · 88d9dc1 · 88d9dc1
1 parent be7fe31
commit 88d9dc1
Show file tree

Hide file tree

Showing 14 changed files with 273 additions and 30 deletions.
diff --git a/README.md b/README.md
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "app.priceguard"
         minSdk = 29
         targetSdk = 34
-        versionCode = 6
-        versionName = "0.3.2"
+        versionCode = 7
+        versionName = "1.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/android/app/src/main/java/app/priceguard/service/PriceGuardFirebaseMessagingService.kt b/android/app/src/main/java/app/priceguard/service/PriceGuardFirebaseMessagingService.kt
@@ -1,11 +1,111 @@
 package app.priceguard.service
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.media.RingtoneManager
+import android.net.Uri
+import android.os.Build
 import android.util.Log
+import androidx.core.app.NotificationCompat
+import app.priceguard.R
+import app.priceguard.ui.detail.DetailActivity
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
 import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
 
 class PriceGuardFirebaseMessagingService : FirebaseMessagingService() {
     // Init 시에도 호출됨
     override fun onNewToken(token: String) {
         Log.d("PriceGuardFirebaseMessagingService", "Refreshed token: $token")
     }
+
+    override fun onMessageReceived(message: RemoteMessage) {
+        super.onMessageReceived(message)
+        message.notification?.let {
+            sendNotification(
+                it.title ?: return,
+                it.body ?: return,
+                it.imageUrl ?: return,
+                message.data["productCode"] ?: return
+            )
+        }
+    }
+
+    private fun sendNotification(title: String, body: String, imageUrl: Uri, data: String) {
+        val intent = Intent(this, DetailActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        intent.putExtra("productCode", data)
+        intent.putExtra("directed", true)
+
+        val requestCode = getRequestCode()
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            requestCode,
+            intent,
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            }
+        )
+
+        Glide.with(applicationContext)
+            .asBitmap()
+            .load(imageUrl)
+            .into(object : CustomTarget<Bitmap>() {
+                override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                    buildNotification(title, body, resource, pendingIntent, requestCode)
+                }
+
+                override fun onLoadCleared(placeholder: Drawable?) {}
+            })
+    }
+
+    private fun buildNotification(
+        title: String,
+        body: String,
+        image: Bitmap,
+        pendingIntent: PendingIntent,
+        requestCode: Int
+    ) {
+        val channelId = getString(R.string.price_notification)
+        val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+        val notificationBuilder = NotificationCompat.Builder(this, channelId)
+            .setSmallIcon(R.drawable.ic_priceguard_notification)
+            .setContentTitle(title)
+            .setContentText(body)
+            .setAutoCancel(true)
+            .setSound(defaultSoundUri)
+            .setLargeIcon(image)
+            .setStyle(NotificationCompat.BigPictureStyle().bigPicture(image))
+            .setContentIntent(pendingIntent)
+
+        val notificationManager =
+            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        val channel = NotificationChannel(
+            channelId,
+            getString(R.string.priceguard_push_alarm_title),
+            NotificationManager.IMPORTANCE_DEFAULT
+        )
+        notificationManager.createNotificationChannel(channel)
+
+        notificationManager.notify(requestCode, notificationBuilder.build())
+    }
+
+    companion object {
+        private var requestCode = 0
+
+        fun getRequestCode(): Int {
+            requestCode = (requestCode + 1) % 100
+            return requestCode
+        }
+    }
 }
diff --git a/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt b/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt
@@ -123,14 +123,18 @@ class SetTargetPriceFragment : Fragment() {
 
     private fun updateTargetPriceUI(it: Editable?) {
         if (binding.etTargetPrice.isFocused) {
-            val targetPrice = if (it.toString().matches("^\\d+\$".toRegex())) {
-                it.toString().toFloat()
+            val targetPrice = if (it.toString().matches("^\\d{1,9}$".toRegex())) {
+                it.toString().toInt()
+            } else if (it.toString().isEmpty()) {
+                binding.etTargetPrice.setText(getString(R.string.min_price))
+                0
             } else {
-                0F
+                binding.etTargetPrice.setText(getString(R.string.max_price))
+                999999999
             }
 
-            setTargetPriceViewModel.updateTargetPrice(targetPrice.toInt())
-            binding.updateSlideValueWithPrice(targetPrice)
+            setTargetPriceViewModel.updateTargetPrice(targetPrice)
+            binding.updateSlideValueWithPrice(targetPrice.toFloat())
         }
     }
 
@@ -212,9 +216,8 @@ class SetTargetPriceFragment : Fragment() {
 
     private fun FragmentSetTargetPriceBinding.updateSlideValueWithPrice(targetPrice: Float) {
         val percent =
-            ((targetPrice / setTargetPriceViewModel.state.value.productPrice) * MAX_PERCENT).toInt().roundAtFirstDigit()
-
-        val pricePercent = percent.coerceIn(MIN_PERCENT, MAX_PERCENT)
+            ((targetPrice / setTargetPriceViewModel.state.value.productPrice) * MAX_PERCENT).toInt()
+        val pricePercent = percent.coerceIn(MIN_PERCENT, MAX_PERCENT).roundAtFirstDigit()
         if (targetPrice > setTargetPriceViewModel.state.value.productPrice) {
             tvTargetPricePercent.text = getString(R.string.over_current_price)
         } else {

diff --git a/android/app/src/main/java/app/priceguard/ui/util/Dialog.kt b/android/app/src/main/java/app/priceguard/ui/util/Dialog.kt
@@ -3,7 +3,6 @@ package app.priceguard.ui.util
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import app.priceguard.ui.ErrorDialogFragment
 import app.priceguard.ui.data.DialogConfirmAction
 
 fun AppCompatActivity.showConfirmDialog(

diff --git a/.../app/priceguard/ui/ErrorDialogFragment.kt → ...priceguard/ui/util/ErrorDialogFragment.kt b/.../app/priceguard/ui/ErrorDialogFragment.kt → ...priceguard/ui/util/ErrorDialogFragment.kt
@@ -1,4 +1,4 @@
-package app.priceguard.ui
+package app.priceguard.ui.util
 
 import android.app.Dialog
 import android.content.Intent

diff --git a/android/app/src/main/res/layout/activity_detail.xml b/android/app/src/main/res/layout/activity_detail.xml
@@ -109,7 +109,7 @@
                             android:layout_marginTop="8dp"
                             android:layout_marginEnd="8dp"
                             android:ellipsize="end"
-                            android:singleLine="true"
+                            android:maxLines="3"
                             android:text="@{viewModel.state.productName}"
                             android:textAppearance="?attr/textAppearanceTitleLarge"
                             app:layout_constraintEnd_toStartOf="@id/btn_detail_share"

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -130,4 +130,7 @@
     <string name="target_price_80">현재 가격의 80%</string>
     <string name="lowest_price_info">역대 최저가 %s</string>
     <string name="target_price_info">목표 가격 %s 으로 설정됨</string>
+    <string name="min_price">0</string>
+    <string name="max_price">999999999</string>
+    <string name="priceguard_push_alarm_title">Product Price Notification</string>
 </resources>
diff --git a/android/release_notes.txt b/android/release_notes.txt
@@ -1,9 +1,12 @@
-December 12, 2023
-v0.3.2
+December 14, 2023
+v1.0.0
+
+🚀 Feature Updates
+
+- 앱이 Foreground에 있어도 알림이 오게끔 지원
+
 
 🔧 Bug Fixes
 
-- 공유하기로 상품 등록 완료 후 앱이 꺼지는 현상 수정
-- 상품 중복 등록 시 홈 화면으로 돌아가도록 수정
-- 상품 수정 시 상세화면으로 돌아가도록 수정
-- 시작화면, 로그인 화면에서 글씨 크기 초과 시 텍스트 크기 자동 조정
+- 목표 가격 설정 범위가 0~999999999 사이에서 설정되도록 수정
+- 상품 상세 페이지 제목 최대 줄 수를 3줄로 변경
diff --git a/backend/src/cache/cache.service.ts b/backend/src/cache/cache.service.ts
@@ -98,6 +98,10 @@ export class CacheService {
         return this.trackingProductCache.get(key);
     }
 
+    getAllTrackingProduct() {
+        return this.trackingProductCache.getAll();
+    }
+
     addValueTrackingProduct(key: string, value: TrackingProduct) {
         this.trackingProductCache.addValue(key, value);
     }

diff --git a/backend/src/cache/tracking.cache.ts b/backend/src/cache/tracking.cache.ts
@@ -20,6 +20,7 @@ export class TrackingProductCache {
         this.delete(key);
         const node = new CacheNode(key, value);
         this.add(node);
+        this.hashMap.set(key, node);
         if (this.count > this.maxSize) {
             const oldestNode = this.head.next;
             this.remove(oldestNode);
@@ -32,22 +33,21 @@ export class TrackingProductCache {
         node.next = this.tail;
         node.prev = prev;
         this.tail.prev = node;
-        this.hashMap.set(node.key, node);
         this.count++;
     }
 
     delete(key: string) {
         const node = this.hashMap.get(key);
         if (node) {
             this.remove(node);
+            this.hashMap.delete(key);
         }
     }
 
     private remove(node: CacheNode<TrackingProduct[]>) {
         const { prev, next } = node;
         prev.next = next;
         next.prev = prev;
-        this.hashMap.delete(node.key);
         this.count--;
     }
 
@@ -67,7 +67,12 @@ export class TrackingProductCache {
 
     get(key: string): TrackingProduct[] | null {
         const node = this.hashMap.get(key);
-        return node ? node.value : null;
+        if (node) {
+            this.remove(node);
+            this.add(node);
+            return node.value;
+        }
+        return null;
     }
 
     getAll() {
@@ -84,6 +89,8 @@ export class TrackingProductCache {
         const node = this.hashMap.get(key);
         if (node) {
             node.value.push(value);
+            this.remove(node);
+            this.add(node);
         }
     }
 
@@ -93,6 +100,8 @@ export class TrackingProductCache {
             node.value = node.value.filter((product) => {
                 return product.productId !== value.productId;
             });
+            this.remove(node);
+            this.add(node);
         }
     }
 
@@ -105,6 +114,8 @@ export class TrackingProductCache {
                     return false;
                 }
             });
+            this.remove(node);
+            this.add(node);
         }
     }
 

diff --git a/backend/src/constants.ts b/backend/src/constants.ts
@@ -39,3 +39,4 @@ export const TWENTY_MIN_TO_SEC = 20 * 60;
 export const TWO_WEEKS_TO_SEC = 2 * 7 * 24 * 60 * 60;
 export const TWO_MONTHS_TO_SEC = 61 * 24 * 60 * 60;
 export const MAX_TRACKING_PRODUCT_CACHE = parseInt(process.env.MAX_TRACKING_PRODUCT_CACHE || '30');
+export const MAX_TARGET_PRICE = 999999999;
diff --git a/backend/src/dto/product.add.dto.ts b/backend/src/dto/product.add.dto.ts
@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import { IsNotEmpty, IsNumber, IsString, Max } from 'class-validator';
+import { MAX_TARGET_PRICE } from 'src/constants';
 
 export class ProductAddDto {
     @ApiProperty({
@@ -16,6 +17,7 @@ export class ProductAddDto {
         required: true,
     })
     @IsNumber()
+    @Max(MAX_TARGET_PRICE)
     @IsNotEmpty()
     targetPrice: number;
 }
diff --git a/backend/src/product/product.service.ts b/backend/src/product/product.service.ts
@@ -12,7 +12,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { ProductPrice } from 'src/schema/product.schema';
 import { Model } from 'mongoose';
 import { PriceDataDto } from 'src/dto/price.data.dto';
-import { MAX_TRACKING_RANK, NINETY_DAYS, THIRTY_DAYS, TWENTY_MIN_TO_SEC } from 'src/constants';
+import { MAX_TRACKING_RANK, NINETY_DAYS, THIRTY_DAYS } from 'src/constants';
 import { ProductRankCacheDto } from 'src/dto/product.rank.cache.dto';
 import Redis from 'ioredis';
 import { InjectRedis } from '@songkeys/nestjs-redis';
@@ -159,6 +159,7 @@ export class ProductService {
         const product = await this.findTrackingProductByCode(userId, productAddDto.productCode);
         product.targetPrice = productAddDto.targetPrice;
         product.isFirst = true;
+        this.cacheService.updateValueTrackingProdcut(userId, product);
         await this.trackingProductRepository.save(product);
     }
 
@@ -264,8 +265,6 @@ export class ProductService {
                 isSoldOut: productInfo.isSoldOut,
                 lowestPrice: productInfo.productPrice,
             }),
-            'EX',
-            TWENTY_MIN_TO_SEC,
         );
         this.productPriceModel.create(updatedDataInfo);
         return product;