Merge branch 'develop' of https://github.com/Ag-crane/Team-ED into de…

…velop

API_SERVER/satellite/build/resources/main/application.yml

@@ -0,0 +1,41 @@
+tle:
+  api-key: FZVfJwO7l89rRRJg67NE56mG0iat9wPEztjLkXJd
+
+server:
+#  address: localhost
+  address: 0.0.0.0
+  port: 8080
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://14.52.137.81:3306/team_ed_user3?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC
+#    username: satellite
+#    password: Abcd123!
+    username: team_ed
+    password: team_ed!@#123
+  jpa:
+    database: mysql
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+jwt:
+  issuer: [email protected]
+  secret_key: satellite-project
+
+#app:
+#  datasource2:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://localhost:3306/root?useSSL=false&serverTimezone=UTC
+#    username: satellite
+#    password: Abcd123!
+
+#logging:
+#  level:
+#    org:
+#      springframework:
+#        security: DEBUG

API_SERVER/satellite/out/production/resources/application.yml

@@ -0,0 +1,41 @@
+tle:
+  api-key: FZVfJwO7l89rRRJg67NE56mG0iat9wPEztjLkXJd
+
+server:
+#  address: localhost
+  address: 0.0.0.0
+  port: 8080
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://14.52.137.81:3306/team_ed_user3?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC
+#    username: satellite
+#    password: Abcd123!
+    username: team_ed
+    password: team_ed!@#123
+  jpa:
+    database: mysql
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+jwt:
+  issuer: [email protected]
+  secret_key: satellite-project
+
+#app:
+#  datasource2:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://localhost:3306/root?useSSL=false&serverTimezone=UTC
+#    username: satellite
+#    password: Abcd123!
+
+#logging:
+#  level:
+#    org:
+#      springframework:
+#        security: DEBUG

API_SERVER/satellite/src/main/java/com/example/satellite/controller/TleDataController.java

@@ -74,8 +74,8 @@ public List<TleData> getTleDataBySatelliteId(@RequestParam String satelliteId) {
     }
 
     @PutMapping("/{satelliteId}")
-    public TleData updateTleData(@PathVariable int id, @RequestBody UpdateTleDataDto tleData) {
-        return service.updateTleData(id, tleData);
+    public TleData updateTleData(@PathVariable String satelliteId, @RequestBody UpdateTleDataDto tleData) {
+        return service.updateTleData(satelliteId, tleData);
     }
 
 }

API_SERVER/satellite/src/main/java/com/example/satellite/dto/UpdateTleDataDto.java

@@ -6,8 +6,5 @@
 @Getter
 @Setter
 public class UpdateTleDataDto { // tle_data 수정할때 쓸 dto
-    private String satelliteNumber;
     private String name;
-    private String classification;
-    private String firstLaunch;
 }

API_SERVER/satellite/src/main/java/com/example/satellite/repository/TleDataRepository.java

@@ -23,4 +23,6 @@ public interface TleDataRepository extends JpaRepository<TleData, Long> {
     List<TleData> findByNameContaining(String satelliteName);
 
     Optional<TleData> findBySatelliteId(String satelliteId);
+
+    Optional<TleData> findById(Integer id);
 }

API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java

@@ -17,6 +17,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+
 @Service
 public class TleDataService {
 
@@ -73,19 +74,15 @@ public List<TleData> getSearchedTleData(String satelliteName) {
         return repository.findByNameContaining(satelliteName);
     }
 
-    public TleData updateTleData(int id, UpdateTleDataDto updateTleDataDto) {
-        if(repository.existsById((long) id)){
-            TleData tleData = repository.findById((long) id).get();
-            tleData.setSatelliteNumber(updateTleDataDto.getSatelliteNumber());
-            tleData.setName(updateTleDataDto.getName());
-            tleData.setClassification(updateTleDataDto.getClassification());
-            tleData.setFirstLaunch(updateTleDataDto.getFirstLaunch());
-            return repository.save(tleData);
-        } else {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "TleData not found");
-        }
+
+    public TleData updateTleData(String id, UpdateTleDataDto updateTleDataDto) {
+        TleData tleData = repository.findBySatelliteId(id)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "TleData not found"));
+        tleData.setName(updateTleDataDto.getName());
+        return repository.save(tleData);
     }
 
+
     public List<TleData> getSearchedTleDataBySatelliteId(String satelliteId) {
         Optional<TleData> optionalTleData = repository.findBySatelliteId(satelliteId);
         return optionalTleData.map(Collections::singletonList).orElse(Collections.emptyList());

API_SERVER/satellite/src/main/resources/application.yml

@@ -0,0 +1,41 @@
+tle:
+  api-key: FZVfJwO7l89rRRJg67NE56mG0iat9wPEztjLkXJd
+
+server:
+#  address: localhost
+  address: 0.0.0.0
+  port: 8080
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://14.52.137.81:3306/team_ed_user3?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC
+#    username: satellite
+#    password: Abcd123!
+    username: team_ed
+    password: team_ed!@#123
+  jpa:
+    database: mysql
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+jwt:
+  issuer: [email protected]
+  secret_key: satellite-project
+
+#app:
+#  datasource2:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://localhost:3306/root?useSSL=false&serverTimezone=UTC
+#    username: satellite
+#    password: Abcd123!
+
+#logging:
+#  level:
+#    org:
+#      springframework:
+#        security: DEBUG