Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix/conflict resolve dev to main #54

Merged
merged 3 commits into from
Feb 14, 2025

Conversation

joyguptaa
Copy link
Contributor

Date: 14 Feb 2025

Developer Name: Joy Gupta


Issue Ticket Number

NA

Description

Resolves Merge Conflicts between Develop and Main

prakashchoudhary07 and others added 3 commits December 12, 2024 01:06
* Implemented Queue (#36)

* Chore : Updated .env.example

* Feat : Added rabbitmq

* Feat : Added exponential retry method

* Feat: Added DTO for message

* Bug : Fixed ExponentialBackoffRetry function

* Feat : Added ExponentialBackoffRetry helper

* Feat : Added Queue code

* Test : Updated Test

* Feat : Updated config to load queue name

* Feat : Added QUEUE_URL in env

* Doc : Updated readme

* Chore : Updated order

* Chore : Fixed broken test and added error handling

* Feat : Added queue handler (#37)

* Chore : Updated .env.example

* Feat : Added rabbitmq

* Feat : Added exponential retry method

* Feat: Added DTO for message

* Bug : Fixed ExponentialBackoffRetry function

* Feat : Added ExponentialBackoffRetry helper

* Feat : Added Queue code

* Test : Updated Test

* Feat : Updated config to load queue name

* Feat : Added QUEUE_URL in env

* Doc : Updated readme

* Chore : Updated order

* Chore : Fixed broken test and added error handling

* Feat : Added queue handler

* Add QUEUE_URL and QUEUE_NAME env  (#39)

* Chore : Updated .env.example

* Feat : Added rabbitmq

* Feat : Added exponential retry method

* Feat: Added DTO for message

* Bug : Fixed ExponentialBackoffRetry function

* Feat : Added ExponentialBackoffRetry helper

* Feat : Added Queue code

* Test : Updated Test

* Feat : Updated config to load queue name

* Feat : Added QUEUE_URL in env

* Doc : Updated readme

* Chore : Updated order

* Chore : Fixed broken test and added error handling

* Feat : Added queue handler

* chore: add queuename and url env

---------

Co-authored-by: Joy <[email protected]>

* replace env to vars (#41)

* Feat/listening command (#43)

* Feat : Added listening command

* Feat : Added helper to DataPacket

* Feat : Updated SendMessage Code

* Test : Fixed test for DataPacket

* Feat : Added listening service

* Chore : Updated function declaration

* Chore : Updated InteractionResponseData

* Feat : Addded end-to-end implementation of listening command

* Feat : Build common package for discord

* WIP : Creating methods for discord

* Test : Added test for commandHandler.MainHandler in QueueHandler

* Test : Added test for QueueHandler

* Test : Added test for MainHandler

* Test : Added test

* Test : Added test

* Chore : Removed consoles

* Chore : Removed fmt

* Chore : Minor change

* Chore : Minor change

* feat : Moved register command flow within main.go (#45)

* Feat : Moved register command flow within main.go

* Refactor : Updated vars & functions name

* Update commands/register/register.go

Co-authored-by: Yash Raj <[email protected]>

* Chore : Minor change

* Chore : Minor change

---------

Co-authored-by: Amit Prakash <[email protected]>
Co-authored-by: Yash Raj <[email protected]>

---------

Co-authored-by: Prakash Choudhary <[email protected]>
Co-authored-by: Amit Prakash <[email protected]>
Co-authored-by: Yash Raj <[email protected]>
@prakashchoudhary07 prakashchoudhary07 merged commit 37f697d into develop Feb 14, 2025
1 check passed
@prakashchoudhary07 prakashchoudhary07 deleted the bugFix/conflict-resolve-dev-to-main branch February 14, 2025 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants