Skip to content
Open

Dev #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
2898b68
농장 검색 수정중
Jul 7, 2023
ba344e4
농장 검색 시 사진 반환 방식 수정
Jul 7, 2023
f129116
Add curUseList & pastUseList APIs in Reserve
lnalice Jul 8, 2023
e29ab02
Add unavailablePeriod API in Reserve
lnalice Jul 8, 2023
2652240
Edit reserve API 8's path
lnalice Jul 8, 2023
a3beee2
Edit newFarm API for db change
lnalice Jul 8, 2023
d7ce389
Edit oauth API
lnalice Jul 8, 2023
b3e4035
Edit districtClarity (Loosen locationSmall checks)
lnalice Jul 8, 2023
58c8d8d
Fix error in oauth
lnalice Jul 8, 2023
d95d6b3
Edit login provider to check Status
lnalice Jul 8, 2023
21dbfe9
Fix error in reservation
lnalice Jul 8, 2023
8e6ab01
Edit reservation status to A (alpha version)
lnalice Jul 8, 2023
7e05e3f
농장 검색 수정
Jul 9, 2023
1fc3bae
Merge branch 'dev' into dev
9659tig Jul 9, 2023
de2c398
Merge pull request #33 from 9659tig/dev
9659tig Jul 9, 2023
e4704ea
농장 검색 이전 버전
Jul 9, 2023
d0d97f7
confit 해결
Jul 9, 2023
f8fdb22
Merge pull request #34 from 9659tig/dev
9659tig Jul 9, 2023
160c806
농장 검색시 사진 1개 같이 반환
Jul 11, 2023
fa22c81
Merge pull request #35 from 9659tig/dev
9659tig Jul 11, 2023
bc28d3b
서버 배포환경에 맞게 농장 검색 sql 수정
Jul 11, 2023
9eb6604
Merge pull request #36 from 9659tig/dev
9659tig Jul 11, 2023
8a13514
로그인 수정
Jul 11, 2023
65ccf5b
Merge pull request #37 from 9659tig/dev
9659tig Jul 11, 2023
947c836
농장 검색 성공 시 result 값 추가
Jul 12, 2023
d993371
Merge pull request #38 from 9659tig/dev
9659tig Jul 12, 2023
5881b72
농장 글 수정 방식 보완
Jul 13, 2023
d11e2be
농장 등록시 농장 사진 등록 가능
Jul 13, 2023
155a77f
Merge pull request #39 from 9659tig/dev
9659tig Jul 13, 2023
01ca394
농장 사진 삭제
Jul 14, 2023
75b956a
Merge pull request #40 from 9659tig/dev
9659tig Jul 14, 2023
6c2bed5
mongoose 에러 해결
Jul 14, 2023
9598fb4
Merge pull request #41 from 9659tig/dev
9659tig Jul 14, 2023
89ad5b7
농장 필터링 구현
Jul 14, 2023
f8d09c3
Merge pull request #42 from 9659tig/dev
9659tig Jul 14, 2023
d21e828
농장주 핸드폰 번호 조회
Jul 22, 2023
95dfb15
로그인 시 핸드폰 번호 함께 전송(임시)
Jul 22, 2023
676e59e
현재,과거 이용농장 picture_url 추가
Jul 22, 2023
0aaed98
로그인 시 프로필사진 반환
Jul 22, 2023
4fb3f00
Merge pull request #43 from 9659tig/dev
9659tig Jul 22, 2023
86034b0
현재,과거 예약 내역 농장 이름 추가
Jul 23, 2023
ac9097e
Merge pull request #44 from 9659tig/dev
9659tig Jul 23, 2023
dd33e24
회원정보 수정시 새로운 토큰값 전달, 토큰 외 개인정보 삭제, 프로필 이미지 수정 시 url 함께 반환
Jul 26, 2023
3140def
Merge pull request #45 from 9659tig/dev
9659tig Jul 26, 2023
115b8b4
찜 목록 농장 반환
Jul 27, 2023
fe97fa2
Merge pull request #47 from 9659tig/dev
9659tig Jul 27, 2023
39eeef3
농장 찜하기 api 수정 - 별점->찜
Jul 29, 2023
9d7ab89
농장 검색,필터링 liked 추가(찜 여부)
Jul 29, 2023
27e51b9
농장 찜 취소
Jul 29, 2023
39594a5
Merge pull request #48 from 9659tig/dev
9659tig Jul 29, 2023
66764cf
token validation 추가
Jul 29, 2023
16b43bf
Merge pull request #49 from 9659tig/dev
9659tig Jul 29, 2023
5100244
현재,과거 농장 내역 변수 통일
Jul 31, 2023
a730190
Merge pull request #50 from 9659tig/dev
9659tig Jul 31, 2023
023bc81
내 보유 농장 조회
Aug 3, 2023
f179a0f
user, farm provider 파일 정리
Aug 3, 2023
806bff6
Merge pull request #51 from 9659tig/dev
9659tig Aug 3, 2023
86c518a
찜한 농장 반환, 찜 취소 수정
Aug 3, 2023
09a7bba
Merge pull request #52 from 9659tig/dev
9659tig Aug 3, 2023
24cfc2e
Provider connection 리팩토링
Aug 3, 2023
5405f2f
service connection 리팩토링
Aug 4, 2023
ef17537
Merge pull request #53 from 9659tig/dev
9659tig Aug 4, 2023
2a1f5ea
개인정보 및 농장 수정, 예약 관련 토큰 활용
Aug 7, 2023
09cb6f7
Merge pull request #54 from 9659tig/dev
9659tig Aug 7, 2023
bf45a0a
보유농장 조회 결과값 수정
Aug 8, 2023
92a8d24
Merge pull request #55 from 9659tig/dev
9659tig Aug 8, 2023
60581d0
농장등록 시 가격,면저 값 string 으로 입력 받음
Aug 10, 2023
1ec6ec1
Merge pull request #56 from 9659tig/dev
9659tig Aug 10, 2023
ab813f4
농장 등록 input값 전환 수정
Aug 10, 2023
c2ef61b
Merge pull request #57 from 9659tig/dev
9659tig Aug 10, 2023
e26a4e3
baseResponse.success 값 고정
Aug 23, 2023
30e0622
회원 탈퇴 시 예약 내역 삭제
Aug 23, 2023
16616c4
Merge pull request #58 from 9659tig/dev
9659tig Aug 23, 2023
3b00717
https 적용
Aug 26, 2023
0f56f9d
Merge pull request #59 from 9659tig/dev
9659tig Aug 26, 2023
7ee8172
실시간 채팅(소켓)
Sep 7, 2023
2b9b4a8
Merge pull request #60 from 9659tig/dev
9659tig Sep 7, 2023
60954c8
Add insert_farmDate API
lnalice Sep 23, 2023
c9f0f9a
Add delete_farmDate & get_farmDate API
lnalice Sep 23, 2023
00ea089
채팅 내역 불러오기
Sep 26, 2023
407e6a2
Merge branch 'dev' of https://github.com/FarmUsProject/FarmUs_Node in…
Sep 26, 2023
02a95d5
이용불가기간 조회
Sep 26, 2023
d512a05
Merge pull request #61 from 9659tig/dev
9659tig Sep 26, 2023
ea823eb
fix login error about no such user
lnalice Oct 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ env

# IDEA
.idea

src/
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const cookieParser = require('cookie-parser');
const logger = require('morgan');
const cors = require("cors");
const { corsOptions } = require('./config/cors');

const app = express();

app.use(cors(corsOptions))
Expand All @@ -17,6 +16,7 @@ if (process.env.NODE_ENV === "production") {
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static('src'));

require('./components/user/userRoute')(app);
require('./components/farm/farmRoute')(app);
Expand Down
18 changes: 16 additions & 2 deletions bin/www
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,31 @@ app.set('port', port);
/**
* Create HTTP server.
*/

const server = http.createServer(app);
const io = require('socket.io')(server);

/**
* Listen on provided port, on all network interfaces.
*/

//httpsServer.listen(httpsPort)
server.listen(port);

io.on('connection', (socket)=>{
require('../components/chat/chatRoute')(io,socket);
console.log('user connected');
socket.on('error', (err)=>{
console.log("Socket error: ", err);
})
})
io.on('error', (err) => {
console.log("testtest");
console.error("Socket.IO 서버 오류:", err);
});

server.on('error', onError);
server.on('listening', onListening);


/**
* Normalize a port into a number, string, or false.
*/
Expand Down
72 changes: 72 additions & 0 deletions components/chat/chatRoute.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
const Chat = require('./chatModel');
const docClient = require('../../config/dynamo')
const {PutItemCommand, QueryCommand } = require("@aws-sdk/client-dynamodb");
const moment = require('moment-timezone');

module.exports = function (io,socket) {
socket.on('send', async(data)=>{
data.name = socket.sender

const koreanTime = moment().tz('Asia/Seoul');
const currentDate = koreanTime.toISOString();

const params = {
TableName: 'Chats',
Item: {
ChatId: {S: socket.id},
sendDate : {S: currentDate},
Sender: {S: socket.sender},
Receiver: {S: socket.receiver},
Message: {S: data.message},
},
};
try{
const command = new PutItemCommand(params);
await docClient.send(command);
console.log("저장완료!!!");
io.sockets.emit('update', data)
}catch(err){
console.error("채팅 메시지 저장 오류", err);
}
})
socket.on('newUser', async(chatInfo)=>{
socket.id = chatInfo.farmer + '_' + chatInfo.user;
if (chatInfo.farmer == chatInfo.email){
socket.sender = chatInfo.farmer
socket.receiver = chatInfo.user
}
else{
socket.sender = chatInfo.user
socket.receiver = chatInfo.farmer
}

try{
const params = {
TableName: 'Chats',
KeyConditionExpression: "ChatId = :ChatId",
ExpressionAttributeValues: {
":ChatId": {S : socket.id}
}
};
const command = new QueryCommand(params)
const result = await docClient.send(command)

const chatLog = result.Items
io.sockets.emit('update', {
name : 'SERVER',
chatLog : chatLog
});
console.log(chatLog);

}catch (err) {
console.error(err);
}


});
socket.on('disconnect', ()=>{
console.log("채팅종료");
})

}

Loading