Code

[iOS] main Merge 컨플릭트 해소#327

Code

Merged

SwiftyJunnos merged 78 commits intoiOS/releaseboostcampwm2023/iOS01-MusicSpot:iOS/releasefrom iOS/task/Main-Merge-Resolveboostcampwm2023/iOS01-MusicSpot:iOS/task/Main-Merge-ResolveCopy head branch name to clipboardDec 14, 2023

+16,901-2,278

Commits

Commits on Nov 13, 2023

• Feat:

  Show description for 79fcf5b
  twoo1999

  committed
  79fcf5b

• Merge branch 'BE/release' of https://github.com/boostcampwm2023/iOS01-MusicSpot into BE/release

  twoo1999

  committed
  e4a0e35

Commits on Nov 14, 2023

• swagger 설정 (#60)

  twoo1999

  authored
  d0389a9

Commits on Nov 20, 2023

• [BE] start journal (#81)

  Show description for c5b093f
  

  twoo1999

  and

  vvans

  authored
  c5b093f

Commits on Nov 21, 2023

• [BE] collection 이름 수정 및 리팩토링 (#86)

  Show description for 977535f
  twoo1999

  authored
  977535f

Commits on Nov 22, 2023

• [BE] 보안 및 docker 추가 (#90)

  Show description for e243d7b
  twoo1999

  authored
  e243d7b

Commits on Nov 23, 2023

• [BE] 여정 삭제 api 구현 및 github action 일부 (#91)

  Show description for 2eb394b
  

  vvans

  and

  twoo1999

  authored
  2eb394b

• [BE] ♻️ : 여정 시작 api 수정 (#93)

  Show description for b9d276c
  twoo1999

  authored
  b9d276c

• [BE] 여정 기록 api (#97)

  Show description for 2a42238
  

  twoo1999

  and

  vvans

  authored
  2a42238

• [BE] ✨ : 실시간 위치 기록 api 구현 (#99)

  Show description for 266a0b4
  twoo1999

  authored
  266a0b4

• [BE] 스웨거 api 수정 및 폴더 구조 리팩토링 (#102)

  Show description for 9434edf
  vvans

  authored
  9434edf

Commits on Nov 24, 2023

• [BE] ✨ : 배포를 위한 페이지 제작 (#109)

  Show description for e161df4
  twoo1999

  authored
  e161df4

Commits on Nov 25, 2023

• [BE] ✨ : github action 기능 추가 (#115)

  Show description for 87a77fd
  twoo1999

  authored
  87a77fd

• Update action.yml (#116)

  twoo1999

  authored
  15301f7

• Update action.yml (#117)

  twoo1999

  authored
  479fef7

• Update action.yml (#118)

  twoo1999

  authored
  76396d4

• [BE] ♻️ : swagger 수정(github action test) (#119)

  Show description for f77108f
  twoo1999

  authored
  f77108f

Commits on Nov 28, 2023

• [BE] ✨ : 여정 마무리 api (#127)

  Show description for baf9a99
  twoo1999

  authored
  baf9a99

• [BE] 여정 조회 API (#126)

  Show description for c312f49
  vvans

  authored
  c312f49

Commits on Nov 30, 2023

• env 파일 제거 (#139)

  twoo1999

  authored
  291bc86

• [BE] 예외 처리 및 스웨거 응답 부분 추가 (#134)

  Show description for 3e5e3a6
  vvans

  authored
  3e5e3a6

• [BE] ♻️ : spot 기록 이미지 데이터 형식 수정 (#133)

  Show description for c5b5130
  twoo1999

  authored
  c5b5130

• [BE] ♻️ : journey 관련 예외처리 수행 (#142)

  Show description for 73881bb
  

  twoo1999

  and

  vvans

  authored
  73881bb

• exception filter 수정 (#145)

  twoo1999

  authored
  d621b7c

• 예외 필터 수정 (#146)

  twoo1999

  authored
  b9c9952

• [BE] 좌표가 이중 배열인 경우 추가 및 기타 예외 처리 (#147)

  Show description for e704bf3
  

  vvans

  and

  twoo1999

  authored
  e704bf3

• [BE] logger 추가 (#152)

  Show description for 5926e3e
  

  twoo1999

  and

  vvans

  authored
  5926e3e

• [BE] spotid로 spot 가져오기 get 요청 구현 및 예외처리 (#151)

  Show description for e52c382
  vvans

  authored
  e52c382

• [BE] 응답 수정 (#157)

  Show description for b3fcbda
  twoo1999

  authored
  b3fcbda

• [BE] exception filter 응답 수정 (#164)

  Show description for c458c96
  twoo1999

  authored
  c458c96

• Be/task/release link (#165)

  Show description for ec7770d
  twoo1999

  authored
  ec7770d

Commits on Dec 5, 2023

• [BE] 여정 조회 방식 변경 및 가장 최근 여정 찾기 api 구현 (#187)

  Show description for a14d057
  vvans

  authored
  a14d057

• [BE] ✨ : 유저 추가 api 구현 (#205)

  Show description for 22a9cc6
  twoo1999

  authored
  22a9cc6

• [BE] ✨ : journey 관련 스키마 및 dto 수정 (#207)

  Show description for 914f542
  twoo1999

  authored
  914f542

• [BE] ♻️ : swagger 응답 예시 수정 및 check 비지니스 로직 수정 (#208)

  Show description for f34c2f5
  twoo1999

  authored
  f34c2f5

Commits on Dec 6, 2023

• Be/task/small modify (#210)

  Show description for 057a50f
  twoo1999

  authored
  057a50f

• [BE] ♻️ : spot 저장 비지니스 로직 수정 (#213)

  Show description for 772d6d8
  

  twoo1999

  and

  vvans

  authored
  772d6d8

• Be/task/logger (#215)

  Show description for a600177
  twoo1999

  authored
  a600177

Commits on Dec 7, 2023

• [BE] ♻️ : 네트워크 과정 필요사항 수정 (#230)

  Show description for 6c593d8
  twoo1999

  authored
  6c593d8

• [BE] ♻️ : spot 생성 시 응답 변경 (#233)

  Show description for 2c1f3c5
  twoo1999

  authored
  2c1f3c5

• [BE] ♻️ : logger 수정 (#234)

  Show description for cceafc0
  twoo1999

  authored
  cceafc0

• [BE] ♻️ : artwork 스키마 및 dto 수정 (#236)

  Show description for 37192a6
  twoo1999

  authored
  37192a6

• Be/test (#237)

  Show description for 6ae3c63
  twoo1999

  authored
  6ae3c63

• Update action.yml (#238)

  twoo1999

  authored
  70a8435

• Update action.yml (#239)

  twoo1999

  authored
  fd51bd8

• Update action.yml (#240)

  twoo1999

  authored
  39f8124

• Be/task/githubaction test (#241)

  Show description for a12d0ee
  twoo1999

  authored
  a12d0ee

• Update spot.controller.ts (#242)

  twoo1999

  authored
  7cf3fff

• [BE] 배포하기위한 수정 (#246)

  Show description for 337b85f
  twoo1999

  authored
  337b85f

Commits on Dec 8, 2023

• Be/task/release (#250)

  Show description for d301f1c
  twoo1999

  authored
  d301f1c

Commits on Dec 9, 2023

• Update action.yml (#259)

  twoo1999

  authored
  83d9dae

• Update action.yml (#260)

  twoo1999

  authored
  e2d9f47

• Update app.module.ts (#261)

  twoo1999

  authored
  9a5144b

• [BE] coordinate dto 수정 (#262)

  Show description for e07df60
  twoo1999

  authored
  e07df60

• [BE] check api 중지 (#264)

  Show description for 0b3f233
  twoo1999

  authored
  0b3f233

• [BE] check api 추가 (#266)

  Show description for 2c6e59b
  twoo1999

  authored
  2c6e59b

• [BE] check 로직에 try catch 추가 (#268)

  Show description for 392d7fd
  twoo1999

  authored
  392d7fd

Commits on Dec 10, 2023

• [BE] ♻️ : Coordinate 전반적인 예외 처리 로직 수정 (#269)

  Show description for ab4700a
  twoo1999

  authored
  ab4700a

• [BE] ♻️ : check 비지니스 로직 수정 (#271)

  Show description for 99ddcd3
  twoo1999

  authored
  99ddcd3

• [BE] ✨ : 여정 삭제 api 구현 (#275)

  Show description for cfd2059
  twoo1999

  authored
  cfd2059

• [BE] 메인 브랜치 merge 충돌 해결 (#285)

  Show description for 97c585a
  

  5 peopleauthored
  97c585a

• [BE] main 브랜치 merge 충돌 해결 (#286)

  Show description for a84e639
  

  5 peopleauthored
  a84e639

• [BE] 충돌해결 (#287)

  Show description for c18e44b
  

  5 peopleauthored
  c18e44b

• Be/task/resolve merge (#291)

  Show description for adea04d
  

  4 peopleauthored
  adea04d

• [BE] : 충돌해결 (#292)

  Show description for cfee895
  

  5 peopleauthored
  cfee895

• Merge pull request #284 from boostcampwm2023/BE/release

  Show description for 37100aa
  SwiftyJunnos

  authored
  37100aa

Commits on Dec 11, 2023

• [BE] : release (#304)

  Show description for 5de0ec2
  

  5 peopleauthored
  5de0ec2

• [BE] iOS 파일 제거 (#306)

  Show description for c671fcb
  

  5 peopleauthored
  c671fcb

Commits on Dec 12, 2023

• [BE] : checjk fix (#308)

  Show description for d1516a8
  

  5 peopleauthored
  d1516a8

• [BE] ♻️ : spot 저장 시 journey의 coordinates에 spot의 coordinate추가 (#311)

  Show description for f6b64f0
  

  5 peopleauthored
  f6b64f0

• [BE] ♻️ : coordinate 판별 decorator 로직 수정 및 spot 저장 시 예외처리 (#314)

  Show description for df066d2
  

  5 peopleauthored
  df066d2

Commits on Dec 13, 2023

• [BE] ♻️ : 마지막 journey의 완료 여부를 확인하는 api 로직 수정 (#319)

  Show description for 26df6e2
  

  5 peopleauthored
  26df6e2

• [BE] ios 파일 추가 (#320)

  Show description for 966f35a
  

  5 peopleauthored
  966f35a

Commits on Dec 14, 2023

• [BE] : 배포 링크 추가 (#321)

  Show description for 5e9732b
  

  5 peopleauthored
  5e9732b

• [BE] 배포 버전 수정 (#322)

  Show description for 23a9c68
  

  5 peopleauthored
  23a9c68

• [BE] : gitignore 충돌 해결 (#324)

  Show description for 80a25ad
  

  5 peopleauthored
  80a25ad

• Merge pull request #325 from boostcampwm2023/BE/release

  Show description for 9e50239
  SwiftyJunnos

  authored
  9e50239

• Merge branch 'main' into iOS/release

  Show description for b387c5b
  SwiftyJunnos

  committed
  b387c5b