fix: remove syndicate sacrifices from inventory #735

Merged
Sainan merged 1 commits from sacrifice into main 2025-01-05 20:34:59 -08:00
Owner

Fixes #637

Fixes #637
coderabbitai[bot] commented 2025-01-05 17:51:02 -08:00 (Migrated from github.com)
Author
Owner

Walkthrough

The pull request modifies the syndicateSacrificeController.ts file, focusing on improving the handling of syndicate sacrifices. The changes introduce a more structured approach to processing sacrifices by renaming the ISyndicateSacrifice interface to ISyndicateSacrificeRequest. The implementation now more carefully retrieves sacrifice details from the ExportSyndicates manifest, differentiating between initiation sacrifices and level-based sacrifices. The inventory update mechanism has been enhanced, using a combineInventoryChanges method to merge inventory modifications more systematically. These modifications aim to provide a more robust and precise method of managing syndicate sacrifice mechanics.

Assessment against linked issues

Objective Addressed Explanation
Consume required resources for syndicate sacrifice [#637]
Ensure correct resource handling from PE+ 0.5.19 data [#637]

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.
<!-- This is an auto-generated comment: summarize by coderabbit.ai --> <!-- walkthrough_start --> ## Walkthrough The pull request modifies the `syndicateSacrificeController.ts` file, focusing on improving the handling of syndicate sacrifices. The changes introduce a more structured approach to processing sacrifices by renaming the `ISyndicateSacrifice` interface to `ISyndicateSacrificeRequest`. The implementation now more carefully retrieves sacrifice details from the `ExportSyndicates` manifest, differentiating between initiation sacrifices and level-based sacrifices. The inventory update mechanism has been enhanced, using a `combineInventoryChanges` method to merge inventory modifications more systematically. These modifications aim to provide a more robust and precise method of managing syndicate sacrifice mechanics. ## Assessment against linked issues | Objective | Addressed | Explanation | |-----------|-----------|-------------| | Consume required resources for syndicate sacrifice [#637] | ✅ | | | Ensure correct resource handling from PE+ 0.5.19 data [#637] | ✅ | | <!-- walkthrough_end --> <!-- internal state start --> <!-- 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 --> <!-- internal state end --> <!-- tips_start --> --- Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? <details> <summary>❤️ Share</summary> - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code) </details> <details> <summary>🪧 Tips</summary> ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit <commit_id>, please review it.` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (Invoked using PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai generate docstrings` to [generate docstrings](https://docs.coderabbit.ai/finishing-touches/docstrings) for this PR. ([Beta](https://docs.coderabbit.ai/early-access#beta)) - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. ### Other keywords and placeholders - Add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. - Add `@coderabbitai summary` to generate the high-level summary at a specific location in the PR description. - Add `@coderabbitai` anywhere in the PR title to generate the title automatically. ### Documentation and Community - Visit our [Documentation](https://docs.coderabbit.ai) for detailed information on how to use CodeRabbit. - Join our [Discord Community](http://discord.gg/coderabbit) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements. </details> <!-- tips_end -->
coderabbitai[bot] (Migrated from github.com) reviewed 2025-01-05 17:54:11 -08:00
coderabbitai[bot] (Migrated from github.com) left a comment
Author
Owner

Actionable comments posted: 0

🧹 Nitpick comments (4)
src/controllers/api/syndicateSacrificeController.ts (4)

4-4: Clarify naming to avoid confusion with both local and imported interfaces
Having ISyndicateSacrifice from the external library and ISyndicateSacrificeRequest locally might be confusing. Consider renaming one of them to keep the codebase more understandable.


29-30: Separate variables for clarity
Storing sacrifice and reward in distinct variables is clear. If they are always used in tandem, consider grouping them in an object to simplify logic.


31-37: Use strict equality and validate sacrifice levels
Leverage strict equality (===) for consistency and to avoid subtle coercion bugs. Also verify titles exists and that an invalid SacrificeLevel is handled cleanly.

-if (data.SacrificeLevel == 0) {
+if (data.SacrificeLevel === 0) {

64-66: Confirm the necessity of the AllowMultiple field
You define AllowMultiple in ISyndicateSacrificeRequest, but no references to it appear in the code. If it's not needed, remove it to keep the interface minimal.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 709c2a401b and 9ab5240c10.

📒 Files selected for processing (1)
  • src/controllers/api/syndicateSacrificeController.ts (2 hunks)
🔇 Additional comments (5)
src/controllers/api/syndicateSacrificeController.ts (5)

6-6: LGTM: Combining inventory changes is a clean approach
The addition of combineInventoryChanges is fitting and helps keep the merging of inventory states more organized.


12-12: Handle potential parsing or casting errors
When using getJSONfromString(String(request.body)), consider adding error handling for malformed JSON or missing fields in ISyndicateSacrificeRequest.


28-28: Ensure valid manifest retrieval
If ExportSyndicates[data.AffiliationTag] is undefined for any reason, a runtime error might occur. Include a guard clause or fallback logic to handle nonexistent syndicates gracefully.


39-48: Prevent negative inventory issues
The code subtracts item counts (x.ItemCount * -1). Ensure that user inventories never drop below zero or handle that scenario appropriately (e.g., rejecting requests if not enough items exist).


55-58: Check for invalid rewards
When calling handleStoreItemAcquisition(reward, accountId), confirm the reward string is valid. If reward is missing or incorrect, the method could fail silently or throw an error.

**Actionable comments posted: 0** <details> <summary>🧹 Nitpick comments (4)</summary><blockquote> <details> <summary>src/controllers/api/syndicateSacrificeController.ts (4)</summary><blockquote> `4-4`: **Clarify naming to avoid confusion with both local and imported interfaces** Having `ISyndicateSacrifice` from the external library and `ISyndicateSacrificeRequest` locally might be confusing. Consider renaming one of them to keep the codebase more understandable. --- `29-30`: **Separate variables for clarity** Storing `sacrifice` and `reward` in distinct variables is clear. If they are always used in tandem, consider grouping them in an object to simplify logic. --- `31-37`: **Use strict equality and validate sacrifice levels** Leverage strict equality (`===`) for consistency and to avoid subtle coercion bugs. Also verify `titles` exists and that an invalid `SacrificeLevel` is handled cleanly. ```diff -if (data.SacrificeLevel == 0) { +if (data.SacrificeLevel === 0) { ``` --- `64-66`: **Confirm the necessity of the AllowMultiple field** You define `AllowMultiple` in `ISyndicateSacrificeRequest`, but no references to it appear in the code. If it's not needed, remove it to keep the interface minimal. </blockquote></details> </blockquote></details> <details> <summary>📜 Review details</summary> **Configuration used: .coderabbit.yaml** **Review profile: CHILL** **Plan: Pro** <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 709c2a401bf22d9014136771fb61e245e6192fe7 and 9ab5240c10e86af3dba9cc50a79fbd2a485da8fa. </details> <details> <summary>📒 Files selected for processing (1)</summary> * `src/controllers/api/syndicateSacrificeController.ts` (2 hunks) </details> <details> <summary>🔇 Additional comments (5)</summary><blockquote> <details> <summary>src/controllers/api/syndicateSacrificeController.ts (5)</summary> `6-6`: **LGTM: Combining inventory changes is a clean approach** The addition of `combineInventoryChanges` is fitting and helps keep the merging of inventory states more organized. --- `12-12`: **Handle potential parsing or casting errors** When using `getJSONfromString(String(request.body))`, consider adding error handling for malformed JSON or missing fields in `ISyndicateSacrificeRequest`. --- `28-28`: **Ensure valid manifest retrieval** If `ExportSyndicates[data.AffiliationTag]` is undefined for any reason, a runtime error might occur. Include a guard clause or fallback logic to handle nonexistent syndicates gracefully. --- `39-48`: **Prevent negative inventory issues** The code subtracts item counts (`x.ItemCount * -1`). Ensure that user inventories never drop below zero or handle that scenario appropriately (e.g., rejecting requests if not enough items exist). --- `55-58`: **Check for invalid rewards** When calling `handleStoreItemAcquisition(reward, accountId)`, confirm the reward string is valid. If `reward` is missing or incorrect, the method could fail silently or throw an error. </details> </blockquote></details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
Sign in to join this conversation.
No description provided.