From 43a632aaa3c4a2ccdfa2a874a765d359dc3ca0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Wed, 4 Oct 2023 09:59:23 +0900
Subject: [PATCH] =?UTF-8?q?laanc=20=EB=82=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8A=94=20boolean=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/laanc/model/BasLaancValidatedRs.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancValidatedRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancValidatedRs.java
index d80513f6..467342d9 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancValidatedRs.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancValidatedRs.java
@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.laanc.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.palnet.biz.api.external.model.PilotValidRs;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -32,6 +33,7 @@ public class BasLaancValidatedRs {
     private boolean isPlanAreaDuplicatd; // 비행계획서비행구역 중복여부
     private boolean isEvaluatedTargetArea; // 평가대상지역여부 - 공역과 겹칠때만 true
     private boolean isFlightArea; // 비행가능여부 - 비행가능 true
+
     private boolean isArcrftWeight; // 항공기중량여부 - 25kg 이하 true
     private boolean isElev; // 고도여부 - 150m 이하 true
 
@@ -47,22 +49,23 @@ public class BasLaancValidatedRs {
                     && !isArcrftDuplicated // 기체 중복여부
                     && !isPlanAreaDuplicatd // 비행구역 중복여부
                     && isFlightArea // 비행가능여부
-                    && (isEvaluatedTargetArea // 관제구역여부
-                    || !isElev // 150m 초과
-                    || !isArcrftWeight); // 25kg 초과
+                    && isCheckingLance();
         }
         return !isArcrftDuplicated
                 && !isPlanAreaDuplicatd
                 && isFlightArea
-                && (isEvaluatedTargetArea
-                || !isElev // 150m 초과
-                || !isArcrftWeight); // 25kg 초과
+                && isCheckingLance();
     }
 
     public boolean isFlight() {
-        return !isEvaluatedTargetArea
-                && isElev
-                && isArcrftWeight;
+        return !isCheckingLance() || isValid();
+    }
+
+    @JsonIgnore
+    public boolean isCheckingLance() {
+        return isEvaluatedTargetArea // 관제구역여부
+                || !isElev // 150m 초과
+                || !isArcrftWeight; // 25kg 초과
     }
 
 }